From hibernate-commits at lists.jboss.org Thu May  1 08:55:52 2008
Content-Type: multipart/mixed; boundary="===============7159431321944437359=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14616 -
 core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util.
Date: Thu, 01 May 2008 08:55:52 -0400
Message-ID: <E1JrYKG-0003VL-Lm@committer01.frg.pub.inap.atl.jboss.com>

--===============7159431321944437359==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-05-01 08:55:52 -0400 (Thu, 01 May 2008)
New Revision: 14616

Removed:
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2=
/functional/util/CustomClassLoaderCacheFactory.java
Log:
Remove unused class that uses JBC internals

Deleted: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cach=
e/jbc2/functional/util/CustomClassLoaderCacheFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc=
2/functional/util/CustomClassLoaderCacheFactory.java	2008-04-30 00:54:37 UT=
C (rev 14615)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc=
2/functional/util/CustomClassLoaderCacheFactory.java	2008-05-01 12:55:52 UT=
C (rev 14616)
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use, m=
odify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, v. 2.1. This program is distributed in t=
he
- * hope that it will be useful, but WITHOUT A WARRANTY; without even the i=
mplied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See th=
e GNU
- * Lesser General Public License for more details. You should have receive=
d a
- * copy of the GNU Lesser General Public License, v.2.1 along with this
- * distribution; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Red Hat Author(s): Brian Stansberry
- */
-
-package org.hibernate.test.cache.jbc2.functional.util;
-
-import org.jboss.cache.CacheImpl;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.DefaultCacheFactory;
-import org.jboss.cache.config.Configuration;
-
-/**
- * CacheFactory impl that allows us to register a desired default classloa=
der
- * for deserializing RPCs.
- * =

- * @author <a href=3D"brian.stansberry(a)jboss.com">Brian Stansberry</a>
- */
-public class CustomClassLoaderCacheFactory<K, V> extends DefaultCacheFacto=
ry<K, V>
-{
-   private ClassLoader customClassLoader;
-   =

-   /**
-    * Create a new CustomClassLoaderCacheFactory.
-    */
-   public CustomClassLoaderCacheFactory(ClassLoader customClassLoader)
-   {
-      super();
-      this.customClassLoader =3D customClassLoader;
-   }
-   =

-   @Override
-   protected void bootstrap(CacheImpl cache, CacheSPI spi, Configuration c=
onfiguration)
-   {
-      super.bootstrap(cache, spi, configuration);
-      =

-      // Replace the deployerClassLoader
-      componentRegistry.registerComponent("deployerClassLoader", customCla=
ssLoader, ClassLoader.class);
-   }   =

-  =

-}


--===============7159431321944437359==--

From hibernate-commits at lists.jboss.org Thu May  1 12:18:03 2008
Content-Type: multipart/mixed; boundary="===============8922720939569177055=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14617 -
 core/trunk/core/src/main/java/org/hibernate/cache.
Date: Thu, 01 May 2008 12:18:03 -0400
Message-ID: <E1JrbTv-00068v-AZ@committer01.frg.pub.inap.atl.jboss.com>

--===============8922720939569177055==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)jboss.com
Date: 2008-05-01 12:18:03 -0400 (Thu, 01 May 2008)
New Revision: 14617

Modified:
   core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java
Log:
Implement equals to deal with parameters of type other than QueryKey

Modified: core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java	2008-05=
-01 12:55:52 UTC (rev 14616)
+++ core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java	2008-05=
-01 16:18:03 UTC (rev 14617)
@@ -51,7 +51,8 @@
 	}
 	=

 	public boolean equals(Object other) {
-		QueryKey that =3D (QueryKey) other;
+      if (!(other instanceof QueryKey)) return false;
+      QueryKey that =3D (QueryKey) other;
 		if ( !sqlQueryString.equals(that.sqlQueryString) ) return false;
 		if ( !EqualsHelper.equals(firstRow, that.firstRow) || !EqualsHelper.equa=
ls(maxRows, that.maxRows) ) return false;
 		if ( !EqualsHelper.equals(customTransformer, that.customTransformer) ) r=
eturn false;


--===============8922720939569177055==--

From hibernate-commits at lists.jboss.org Thu May  1 16:24:02 2008
Content-Type: multipart/mixed; boundary="===============0036412510435177569=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14618 -
 core/trunk/core/src/main/java/org/hibernate/event.
Date: Thu, 01 May 2008 16:24:01 -0400
Message-ID: <E1JrfJx-0002Po-R7@committer01.frg.pub.inap.atl.jboss.com>

--===============0036412510435177569==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 16:24:01 -0400 (Thu, 01 May 2008)
New Revision: 14618

Modified:
   core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java
Log:
Propagate the nested exception when an EventListener init fails

Modified: core/trunk/core/src/main/java/org/hibernate/event/EventListeners.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-01 16:18:03 UTC (rev 14617)
+++ core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-01 20:24:01 UTC (rev 14618)
@@ -172,7 +172,7 @@
 				}
 			}
 			catch ( Exception e ) {
-				throw new AssertionFailure( "could not process listeners" );
+				throw new AssertionFailure( "could not process listeners", e );
 			}
 		}
 	}


--===============0036412510435177569==--

From hibernate-commits at lists.jboss.org Thu May  1 16:34:19 2008
Content-Type: multipart/mixed; boundary="===============3191285021841484961=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14619 -
 core/trunk/core/src/main/java/org/hibernate/event.
Date: Thu, 01 May 2008 16:34:19 -0400
Message-ID: <E1JrfTv-0004fK-2p@committer01.frg.pub.inap.atl.jboss.com>

--===============3191285021841484961==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 16:34:18 -0400 (Thu, 01 May 2008)
New Revision: 14619

Modified:
   core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java
Log:
HHH-3260 Wrapping listener exceptions into an AssertionFailure is not good.=
 Replacing with HibernateException

Modified: core/trunk/core/src/main/java/org/hibernate/event/EventListeners.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-01 20:24:01 UTC (rev 14618)
+++ core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-01 20:34:18 UTC (rev 14619)
@@ -31,6 +31,7 @@
 =

 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
+import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.event.def.DefaultAutoFlushEventListener;
 import org.hibernate.event.def.DefaultDeleteEventListener;
@@ -172,7 +173,7 @@
 				}
 			}
 			catch ( Exception e ) {
-				throw new AssertionFailure( "could not process listeners", e );
+				throw new HibernateException( "could not process listeners", e );
 			}
 		}
 	}
@@ -196,7 +197,7 @@
 			);
 		}
 		catch ( Exception e ) {
-			throw new AssertionFailure("could not init listeners");
+			throw new HibernateException("could not init listeners", e);
 		}
 	}
 =

@@ -213,7 +214,7 @@
 			);
 		}
 		catch ( Exception e ) {
-			throw new AssertionFailure("could not init listeners");
+			throw new HibernateException("could not destruct listeners", e);
 		}
 	}
 =



--===============3191285021841484961==--

From hibernate-commits at lists.jboss.org Thu May  1 18:05:14 2008
Content-Type: multipart/mixed; boundary="===============5730851536193818234=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14620 - commons-annotations/tags.
Date: Thu, 01 May 2008 18:05:13 -0400
Message-ID: <E1Jrgtt-0000k6-S2@committer01.frg.pub.inap.atl.jboss.com>

--===============5730851536193818234==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:05:13 -0400 (Thu, 01 May 2008)
New Revision: 14620

Added:
   commons-annotations/tags/core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: commons-annotations/tags/core_3_3_support (from rev 14619, commons-=
annotations/trunk)


--===============5730851536193818234==--

From hibernate-commits at lists.jboss.org Thu May  1 18:05:28 2008
Content-Type: multipart/mixed; boundary="===============5823285734226176011=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14621 - annotations/tags.
Date: Thu, 01 May 2008 18:05:28 -0400
Message-ID: <E1Jrgu8-0000lW-F2@committer01.frg.pub.inap.atl.jboss.com>

--===============5823285734226176011==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:05:28 -0400 (Thu, 01 May 2008)
New Revision: 14621

Added:
   annotations/tags/core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: annotations/tags/core_3_3_support (from rev 14620, commons-annotati=
ons/trunk)


--===============5823285734226176011==--

From hibernate-commits at lists.jboss.org Thu May  1 18:05:54 2008
Content-Type: multipart/mixed; boundary="===============9108729255424430018=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14622 - annotations/tags.
Date: Thu, 01 May 2008 18:05:53 -0400
Message-ID: <E1JrguX-0000nK-Up@committer01.frg.pub.inap.atl.jboss.com>

--===============9108729255424430018==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:05:53 -0400 (Thu, 01 May 2008)
New Revision: 14622

Removed:
   annotations/tags/core_3_3_support/
Log:
messed up projects


--===============9108729255424430018==--

From hibernate-commits at lists.jboss.org Thu May  1 18:06:14 2008
Content-Type: multipart/mixed; boundary="===============0930524928549050852=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14623 - annotations/tags.
Date: Thu, 01 May 2008 18:06:14 -0400
Message-ID: <E1Jrgus-0000op-Dq@committer01.frg.pub.inap.atl.jboss.com>

--===============0930524928549050852==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:06:14 -0400 (Thu, 01 May 2008)
New Revision: 14623

Added:
   annotations/tags/core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: annotations/tags/core_3_3_support (from rev 14622, annotations/trun=
k)


--===============0930524928549050852==--

From hibernate-commits at lists.jboss.org Thu May  1 18:07:01 2008
Content-Type: multipart/mixed; boundary="===============1908557416565001577=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14624 - annotations/tags.
Date: Thu, 01 May 2008 18:07:01 -0400
Message-ID: <E1Jrgvd-0000rn-PA@committer01.frg.pub.inap.atl.jboss.com>

--===============1908557416565001577==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:07:01 -0400 (Thu, 01 May 2008)
New Revision: 14624

Added:
   annotations/tags/before_core_3_3_support/
Removed:
   annotations/tags/core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: annotations/tags/before_core_3_3_support (from rev 14623, annotatio=
ns/tags/core_3_3_support)


--===============1908557416565001577==--

From hibernate-commits at lists.jboss.org Thu May  1 18:07:22 2008
Content-Type: multipart/mixed; boundary="===============2822148976658723373=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14625 - commons-annotations/tags.
Date: Thu, 01 May 2008 18:07:22 -0400
Message-ID: <E1Jrgvy-0000t0-GP@committer01.frg.pub.inap.atl.jboss.com>

--===============2822148976658723373==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:07:22 -0400 (Thu, 01 May 2008)
New Revision: 14625

Added:
   commons-annotations/tags/before_core_3_3_support/
Removed:
   commons-annotations/tags/core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: commons-annotations/tags/before_core_3_3_support (from rev 14624, c=
ommons-annotations/tags/core_3_3_support)


--===============2822148976658723373==--

From hibernate-commits at lists.jboss.org Thu May  1 18:08:27 2008
Content-Type: multipart/mixed; boundary="===============1848450924368777335=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14626 - entitymanager/tags.
Date: Thu, 01 May 2008 18:08:27 -0400
Message-ID: <E1Jrgx1-0000ur-G1@committer01.frg.pub.inap.atl.jboss.com>

--===============1848450924368777335==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:08:27 -0400 (Thu, 01 May 2008)
New Revision: 14626

Added:
   entitymanager/tags/before_core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: entitymanager/tags/before_core_3_3_support (from rev 14625, entitym=
anager/trunk)


--===============1848450924368777335==--

From hibernate-commits at lists.jboss.org Thu May  1 18:08:53 2008
Content-Type: multipart/mixed; boundary="===============4183287350846159797=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14627 - search/tags.
Date: Thu, 01 May 2008 18:08:53 -0400
Message-ID: <E1JrgxR-0000vO-1G@committer01.frg.pub.inap.atl.jboss.com>

--===============4183287350846159797==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:08:52 -0400 (Thu, 01 May 2008)
New Revision: 14627

Added:
   search/tags/before_core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: search/tags/before_core_3_3_support (from rev 14626, search/trunk)


--===============4183287350846159797==--

From hibernate-commits at lists.jboss.org Thu May  1 18:09:18 2008
Content-Type: multipart/mixed; boundary="===============5971438758081318710=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14628 - validator/tags.
Date: Thu, 01 May 2008 18:09:18 -0400
Message-ID: <E1Jrgxq-0000wF-8N@committer01.frg.pub.inap.atl.jboss.com>

--===============5971438758081318710==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:09:18 -0400 (Thu, 01 May 2008)
New Revision: 14628

Added:
   validator/tags/before_core_3_3_support/
Log:
tag before support for core 3.3 in trunk

Copied: validator/tags/before_core_3_3_support (from rev 14627, validator/t=
runk)


--===============5971438758081318710==--

From hibernate-commits at lists.jboss.org Thu May  1 18:46:46 2008
Content-Type: multipart/mixed; boundary="===============8364594556587085190=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14629 - in
 commons-annotations/trunk: doc and 4 other directories.
Date: Thu, 01 May 2008 18:46:46 -0400
Message-ID: <E1JrhY6-0001T4-AE@committer01.frg.pub.inap.atl.jboss.com>

--===============8364594556587085190==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-01 18:46:46 -0400 (Thu, 01 May 2008)
New Revision: 14629

Added:
   commons-annotations/trunk/doc/
   commons-annotations/trunk/doc/api/
   commons-annotations/trunk/doc/api/jdstyle.css
   commons-annotations/trunk/doc/api/package.html
   commons-annotations/trunk/ivy/maven-ant-tasks.jar
   commons-annotations/trunk/lib/build/
   commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
   commons-annotations/trunk/lib/build/junit-3.8.1.jar
   commons-annotations/trunk/pom.xml
Modified:
   commons-annotations/trunk/build.xml
   commons-annotations/trunk/common-build.xml
   commons-annotations/trunk/ivy.xml
   commons-annotations/trunk/ivy/ivyconf.xml
Log:
HCANN-3 HCANN-2 change build system to get deps from JBoss repo, make doc b=
uild independent of hibernate core structure ; add pom


Modified: commons-annotations/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/build.xml	2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/build.xml	2008-05-01 22:46:46 UTC (rev 14629)
@@ -9,7 +9,7 @@
 	<!-- Name of project and version, used to create filenames -->
 	<property name=3D"Name" value=3D"Hibernate Commons Annotations"/>
 	<property name=3D"name" value=3D"hibernate-commons-annotations"/>
-	<property name=3D"version" value=3D"3.0.0.GA"/>
+	<property name=3D"version" value=3D"3.1.0.CR1"/>
 	<property name=3D"javadoc.packagenames" value=3D"org.hibernate.commons.an=
notations.*"/>
 	<property name=3D"copy.test" value=3D"true"/>
 	<property name=3D"javac.source" value=3D"1.5"/>
@@ -21,7 +21,7 @@
 =

     <import file=3D"${common.dir}/common-build.xml"/>
 =

-	<path id=3D"lib.class.path">
+	<!-- FIXME path id=3D"lib.class.path">
     	<fileset dir=3D"${hibernate-core.lib.dir}">
 			<include name=3D"commons-logging*.jar"/>
 			<include name=3D"log4j*.jar"/>
@@ -34,18 +34,20 @@
 		</fileset>
         <path refid=3D"lib.moduleclass.path"/>
 		<pathelement path=3D"${clover.jar}"/>
+    </path -->
+    <path id=3D"lib.moduleclass.path">
+        <fileset dir=3D"${ivy.dep.dir}/core">
+			<include name=3D"*.jar"/>
+		</fileset>
     </path>
 =

-	<path id=3D"junit.moduleclasspath">
+    <path id=3D"junit.moduleclasspath">
 		<pathelement location=3D"${src.dir}"/>
 		<pathelement location=3D"${test.dir}"/>
 		<!-- pathelement location=3D"${jpa-api.jar}"/ -->
         <fileset dir=3D"${ivy.dep.dir}/test">
 			<include name=3D"*.jar"/>
 		</fileset>
-        <fileset dir=3D"${hibernate-core.lib.dir}">
-			<include name=3D"junit*.jar"/>
-		</fileset>
 	</path>
 =

     <!-- ivy load -->
@@ -98,8 +100,8 @@
 	</target>
 =

     <target name=3D"get.deps.core" depends=3D"init" description=3D"retriev=
e the core dependencies">
-        <ivy:resolve conf=3D"core" />
-        <ivy:retrieve pattern=3D"${ivy.dep.dir}/test/[artifact].[ext]" con=
f=3D"core" />
+        <ivy:resolve conf=3D"default" />
+        <ivy:retrieve pattern=3D"${ivy.dep.dir}/core/[artifact].[ext]" con=
f=3D"default" />
     </target>
 =

     <target name=3D"compile" depends=3D"get.deps.core">
@@ -145,7 +147,7 @@
 		</manifest>
 		<antcall target=3D"common-build.jar"/>
         <delete file=3D"${dist.dir}/ivy.xml"/> <!-- delete last produced i=
vy file to be sure a new one will be generated -->        =

-        <ivy:resolve conf=3D"core"/>
+        <ivy:resolve conf=3D"default"/>
         <ivy:publish artifactspattern=3D"${dist.dir}/[artifact].[ext]"
             resolver=3D"local"
             pubrevision=3D"latest"
@@ -179,6 +181,11 @@
                 <include name=3D"*.jar"/>
             </fileset>
         </copy>
+
+        <mkdir dir=3D"${dist.lib.dir}/build"/>
+        <copy todir=3D"${dist.lib.dir}/build" failonerror=3D"false">
+			<fileset file=3D"${lib.dir}/build/*.jar"/>
+        </copy>
         =

         <antcall target=3D"common-build.dist"/>
 	</target>

Modified: commons-annotations/trunk/common-build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/common-build.xml	2008-05-01 22:09:18 UTC (rev=
 14628)
+++ commons-annotations/trunk/common-build.xml	2008-05-01 22:46:46 UTC (rev=
 14629)
@@ -1,5 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project name=3D"common-build" default=3D"dist">
+<project name=3D"common-build" default=3D"dist"
+        xmlns:artifact=3D"urn:maven-artifact-ant">
 	<description>Common properties and targets for the HibernateExt project</=
description>
 =

 	<!-- my.basedir property can be used to refer to files/directories relati=
vely to the common-build.xml file -->
@@ -39,39 +40,15 @@
 	<property name=3D"javac.source" value=3D"1.4"/>
 	<property name=3D"javac.target" value=3D"1.4"/>
 =

+    <property name=3D"pom.file" value=3D"pom.xml"/>
+    <property name=3D"src.jar" value=3D"${build.dir}/src.jar"/>
 =

-	<!-- set Hibernate core related properties -->
-    <property name=3D"hibernate-core.home" location=3D"${common-build.base=
dir}/../hibernate-3.2"/>
-    <property name=3D"hibernate-core.jar" location=3D"${hibernate-core.hom=
e}/hibernate3.jar"/>
-    <property name=3D"hibernate-core.lib.dir" location=3D"${hibernate-core=
.home}/lib"/>
-    <property name=3D"hibernate-core.jdbc.dir" location=3D"${hibernate-cor=
e.home}/lib"/>  <!-- for some reason jdbc.dir is renamed to lib instead of =
jdbc when doing a dist of hibernate3 -->
-    <property name=3D"hibernate-core.doc.api" location=3D"${hibernate-core=
.home}/doc/api"/>
-    <property name=3D"hibernate-cvs.doc.reference" location=3D"${common-bu=
ild.basedir}/../core/doc/reference"/>
+    <!-- build related properties -->
+    <property name=3D"build.lib.dir" value=3D"${lib.dir}/build"/>
 =

-	<!--
-	Explicitly define tasks from ant..
-	Unfortunately, checkstyle-a<path id=3D"lib.class.path">
-    	<path location=3D"${hibernate-core.jar}"></path>
-        <fileset dir=3D"${hibernate-core.lib.dir}">
-            <include name=3D"*.jar"/>
-        </fileset>
-        <fileset dir=3D"${lib.dir}">
-            <include name=3D"*.jar"/>
-        </fileset>
-        <pathelement path=3D"${clover.jar}"/>
-    </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be i=
n the classpath.
-	-->
-	<!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package...
-    taskdef name=3D"antlr" classname=3D"org.apache.tools.ant.taskdefs.opti=
onal.ANTLR">
-		<classpath>
-			<pathelement location=3D"${hibernate-core.lib.dir}/antlr-2.7.2.jar"/>
-			<pathelement location=3D"${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"=
/>
-		</classpath>
-	</taskdef -->
-   =

 	<taskdef name=3D"junit" classname=3D"org.apache.tools.ant.taskdefs.option=
al.junit.JUnitTask">
 		<classpath>
-			<fileset dir=3D"${hibernate-core.lib.dir}">
+			<fileset dir=3D"${common-build.basedir}/lib/build"> <!-- ${build.lib.di=
r} fails in reference doc build -->
 			    <include name=3D"junit-*.jar"/>
                 <include name=3D"ant-junit-*.jar"/>
 			</fileset>
@@ -80,18 +57,31 @@
 =

 	<taskdef name=3D"junitreport" classname=3D"org.apache.tools.ant.taskdefs.=
optional.junit.XMLResultAggregator">
         <classpath>
-            <fileset dir=3D"${hibernate-core.lib.dir}">
+            <fileset dir=3D"${common-build.basedir}/lib/build"> <!-- ${bui=
ld.lib.dir} fails in reference doc build -->                 =

                 <include name=3D"junit-*.jar"/>
                 <include name=3D"ant-junit-*.jar"/>
             </fileset>
         </classpath>
 	</taskdef>
 =

+    <!-- ivy load -->
+	<property name=3D"ivy.jar.dir" value=3D"${common-build.basedir}/ivy" />
+    <property name=3D"ivy.conf.dir" value=3D"${common-build.basedir}" />
+	<path id=3D"ivy.lib.path">
+		<fileset dir=3D"${ivy.jar.dir}" includes=3D"*.jar"/>
+	</path>
+	<taskdef resource=3D"fr/jayasoft/ivy/ant/antlib.xml"
+			  uri=3D"antlib:fr.jayasoft.ivy.ant" classpathref=3D"ivy.lib.path"/>
+    =

+    <!-- maven task load -->
+    <path id=3D"maven-ant-tasks.path" path=3D"${ivy.jar.dir}/maven-ant-tas=
ks.jar" />
+    <typedef resource=3D"org/apache/maven/artifact/ant/antlib.xml"
+             uri=3D"urn:maven-artifact-ant"
+             classpathref=3D"maven-ant-tasks.path" />
+
+    <artifact:remoteRepository id=3D"offline.repository.jboss.org" url=3D"=
file://${offline.repository.jboss.org}" />
+
     <path id=3D"lib.class.path">
-    	<path location=3D"${hibernate-core.jar}"></path>
-        <fileset dir=3D"${hibernate-core.lib.dir}">
-            <include name=3D"*.jar"/>
-        </fileset>
         <fileset dir=3D"${lib.dir}">
             <include name=3D"*.jar"/>
         </fileset>
@@ -196,9 +186,6 @@
             	<include name=3D"lgpl.txt"/>
             </fileset>
         </copy>
-
-	    	<available file=3D"${hibernate-core.jar}" type=3D"file" property=3D"=
hibernate-core.jar.available"/>
-    		<fail unless=3D"hibernate-core.jar.available" message=3D"Cannot loca=
te hibernate-core.jar: ${hibernate-core.jar}"/>
     </target>
 =

     <target name=3D"compile" depends=3D"init" description=3D"Compile the J=
ava source code">
@@ -337,7 +324,7 @@
         	windowtitle=3D"${Name} API Documentation"
         	Overview=3D"${doc.api.dir}/package.html"
         	doctitle=3D"${Name} API Documentation"
-        	stylesheetfile=3D"${hibernate-core.doc.api}/jdstyle.css"
+        	stylesheetfile=3D"${doc.api.dir}/jdstyle.css"
         	link=3D"${javadoc}">
         	<packageset dir=3D"${src.dir}" defaultexcludes=3D"yes" >
 		      <include name=3D"**/*" />
@@ -469,4 +456,28 @@
 		<cvs command=3D"-q diff -u -N" output=3D"patch.txt"/>
 	</target>
 =

+    <!-- maven deploy: to be used by the subbuild and delcare deps on jar =
-->
+    <target name=3D"deploy" depends=3D"jar">
+        <fail unless=3D"offline.repository.jboss.org" message=3D"offline.r=
epository.jboss.org must be defined"/>
+        <jar jarfile=3D"${src.jar}" basedir=3D"${src.dir}">
+          <include name=3D"**/*.java" />
+          <exclude name=3D"**/test/*.java" />
+          <!-- patternset refid=3D"meta.files" / -->
+        </jar>
+
+        <artifact:pom id=3D"maven.project" file=3D"${pom.file}" />
+
+        <artifact:install file=3D"${jar.file.name}">
+            <pom refid=3D"maven.project"/>
+        </artifact:install>
+
+        <artifact:deploy file=3D"${jar.file.name}">
+          <pom refid=3D"maven.project" />
+          <remoteRepository refId=3D"offline.repository.jboss.org">
+          </remoteRepository>
+          <attach file=3D"${src.jar}" classifier=3D"sources" />
+            <attach file=3D"${jar.file.name}" classifier=3D"" />
+        </artifact:deploy>
+    </target>
+
 </project>
\ No newline at end of file

Added: commons-annotations/trunk/doc/api/jdstyle.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/doc/api/jdstyle.css	                        (=
rev 0)
+++ commons-annotations/trunk/doc/api/jdstyle.css	2008-05-01 22:46:46 UTC (=
rev 14629)
@@ -0,0 +1,117 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the de=
faults  */
+
+/* Page background color */
+body { 	font-family: Arial;
+	background-color: white;
+	font-size: 10pt;
+ }
+td { 	font-family: Arial;
+	font-size: 10pt;
+ }
+/* Table colors */
+.TableHeadingColor     { background: #F4F4F4 }
+.TableSubHeadingColor  { background: #F4F4F4 }
+.TableRowColor         { background: #FFFFFF }
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: normal; font-family: Arial }
+.FrameHeadingFont { font-size: normal; font-family: Arial }
+.FrameItemFont    { font-size: normal; font-family: Arial }
+
+/* Example of smaller, sans-serif font in frames */
+/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-=
serif } */
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#F4F4F4;}
+.NavBarCell1Rev { background-color:silver;}
+
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000=
;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF=
;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-co=
lor:#FFFFFF;}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-co=
lor:#FFFFFF;}
+
+A {
+    color: #003399;
+}
+
+A:active {
+    color: #003399;
+}
+
+A:visited {
+    color: #888888;
+}
+
+P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+    color: #000000;
+}
+
+TD, TH, SPAN {
+    color: #000000;
+}
+
+BLOCKQUOTE {
+    margin-right: 0px;
+}
+
+
+/*H1, H2, H3, H4, H5, H6    {
+    color: #000000;
+    font-weight:500;
+    margin-top:10px;
+    padding-top:15px;
+}
+
+H1 { font-size: 150%; }
+H2 { font-size: 140%; }
+H3 { font-size: 110%; font-weight: bold; }
+H4 { font-size: 110%; font-weight: bold;}
+H5 { font-size: 100%; font-style: italic; }
+H6 { font-size: 100%; font-style: italic; }*/
+
+TT {
+font-size: 90%;
+    font-family: "Courier New", Courier, monospace;
+    color: #000000;
+}
+
+PRE {
+font-size: 90%;
+    padding: 5px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #CCCCCC;
+    background-color: #F4F4F4;
+}
+
+UL, OL, LI {
+    list-style: disc;
+}
+
+HR  {
+    width: 100%;
+    height: 1px;
+    background-color: #CCCCCC;
+    border-width: 0px;
+    padding: 0px;
+    color: #CCCCCC;
+}
+
+.variablelist { =

+    padding-top: 10; =

+    padding-bottom:10; =

+    margin:0;
+}
+
+.itemizedlist, UL { =

+    padding-top: 0; =

+    padding-bottom:0; =

+    margin:0; =

+}
+
+.term { =

+    font-weight:bold;
+}

Added: commons-annotations/trunk/doc/api/package.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/doc/api/package.html	                        =
(rev 0)
+++ commons-annotations/trunk/doc/api/package.html	2008-05-01 22:46:46 UTC =
(rev 14629)
@@ -0,0 +1 @@
+<body></body>

Modified: commons-annotations/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/ivy/ivyconf.xml	2008-05-01 22:09:18 UTC (rev =
14628)
+++ commons-annotations/trunk/ivy/ivyconf.xml	2008-05-01 22:46:46 UTC (rev =
14629)
@@ -1,9 +1,10 @@
 <ivyconf>
+    <!-- conf defaultResolver=3D"jboss-rep"/ -->
     <conf defaultResolver=3D"jboss-rep"/>
     <resolvers>
         <chain name=3D"jboss-rep">
-            <url name=3D"jboss-rep-regular">
-                <artifact pattern=3D"http://repository.jboss.org/[module]/=
[revision]/lib/[artifact].[ext]"/>
+            <url name=3D"jboss-rep-regular" m2compatible=3D"true">
+                <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>
         </chain>
         <chain name=3D"rep-hibernate" returnFirst=3D"true" latest=3D"lates=
t-revision">
@@ -11,18 +12,12 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
-            <url name=3D"jboss-rep-hibernate">
-                <ivy pattern=3D"http://repository.jboss.org/hibernate-[mod=
ule]/[revision]/ivy.xml"/>
-                <artifact pattern=3D"http://repository.jboss.org/hibernate=
-[module]/[revision]/lib/[artifact].[ext]"/>
-            </url>
-            <url name=3D"jboss-rep-regular-with-ivy">
-                <ivy pattern=3D"http://repository.jboss.org/[module]/[revi=
sion]/ivy.xml"/>
-                <artifact pattern=3D"http://repository.jboss.org/[module]/=
[revision]/lib/[artifact].[ext]"/>
-            </url>
-            <url name=3D"jboss-rep-maven" m2compatible=3D"true">
-                <ivy pattern=3D"http://repository.jboss.org/maven2/[organi=
zation]/[module]/[revision]/ivy.xml"/>
+            <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>
+            <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
+                <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].=
[ext]"/>
+            </url>
         </chain>
     </resolvers>
     <modules>

Added: commons-annotations/trunk/ivy/maven-ant-tasks.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: commons-annotations/trunk/ivy/maven-ant-tasks.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: commons-annotations/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/ivy.xml	2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/ivy.xml	2008-05-01 22:46:46 UTC (rev 14629)
@@ -3,15 +3,25 @@
             xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation=3D
                   "http://www.jayasoft.org/misc/ivy/ivy.xsd">
-    <info organisation=3D"org.hibernate" module=3D"hibernate-commons-annot=
ations"/>
+    <info organisation=3D"org.hibernate" module=3D"commons-annotations"/>
     <configurations>
-        <conf name=3D"core" description=3D"Core module dependencies"/>
+        <conf name=3D"default" description=3D"Core module dependencies"/>
         <conf name=3D"test" visibility=3D"private" description=3D"Dependen=
cies needed for testing purposes"/>
     </configurations>
     <publications>
-        <artifact name=3D"hibernate-commons-annotations" conf=3D"core"/>
+        <artifact name=3D"hibernate-commons-annotations" conf=3D"default"/>
     </publications>
     <dependencies>
-		<dependency name=3D"ejb3-persistence" rev=3D"1.0.1.GA" conf=3D"test->def=
ault"/>
+		<!-- compile time dependencies -->
+        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
+
+        <!-- transitive dependencies -->
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/> <!-- soon to be a dep -->
+
+        <!-- test deps -->
+        <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"tes=
t->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-log4j12" rev=3D"1.4.2"=
 conf=3D"test->default"/>
+        <dependency org=3D"log4j" name=3D"log4j" rev=3D"1.2.14" conf=3D"te=
st->default"/>
+        <dependency org=3D"junit" name=3D"junit" rev=3D"3.8.1" conf=3D"tes=
t->default"/>
     </dependencies>
 </ivy-module>
\ No newline at end of file

Added: commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: commons-annotations/trunk/lib/build/junit-3.8.1.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: commons-annotations/trunk/lib/build/junit-3.8.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: commons-annotations/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/pom.xml	                        (rev 0)
+++ commons-annotations/trunk/pom.xml	2008-05-01 22:46:46 UTC (rev 14629)
@@ -0,0 +1,28 @@
+<?xml version=3D"1.0"?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.hibernate</groupId>
+	<artifactId>hibernate-commons-annotations</artifactId>
+	<packaging>jar</packaging>
+	<name>Hibernate Commons Annotations</name>
+	<version>3.1.0.CR1</version>
+	<licenses>
+		<license>
+			<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
+			<url>http://www.gnu.org/licenses/lgpl.txt</url>
+		</license>
+	</licenses>
+	<description>Hibernate Commons Annotations is a utility project used by a=
nnotations based Hibernate sub-projects.</description>
+	<scm>
+		<url>scm:svn:http://anonsvn.jboss.org/repos/hibernate/commons-annotation=
s</url>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file


--===============8364594556587085190==--

From hibernate-commits at lists.jboss.org Thu May  1 18:53:45 2008
Content-Type: multipart/mixed; boundary="===============2450518371036831444=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14630 -
 core/trunk/core/src/main/java/org/hibernate/cache.
Date: Thu, 01 May 2008 18:53:44 -0400
Message-ID: <E1Jrheq-0002dy-TQ@committer01.frg.pub.inap.atl.jboss.com>

--===============2450518371036831444==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-01 18:53:44 -0400 (Thu, 01 May 2008)
New Revision: 14630

Modified:
   core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java
Log:
HHH-2021 : reformat fix for fragile QueryKey.equals() =



Modified: core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java	2008-05=
-01 22:46:46 UTC (rev 14629)
+++ core/trunk/core/src/main/java/org/hibernate/cache/QueryKey.java	2008-05=
-01 22:53:44 UTC (rev 14630)
@@ -51,8 +51,8 @@
 	}
 	=

 	public boolean equals(Object other) {
-      if (!(other instanceof QueryKey)) return false;
-      QueryKey that =3D (QueryKey) other;
+		if (!(other instanceof QueryKey)) return false;
+		QueryKey that =3D (QueryKey) other;
 		if ( !sqlQueryString.equals(that.sqlQueryString) ) return false;
 		if ( !EqualsHelper.equals(firstRow, that.firstRow) || !EqualsHelper.equa=
ls(maxRows, that.maxRows) ) return false;
 		if ( !EqualsHelper.equals(customTransformer, that.customTransformer) ) r=
eturn false;


--===============2450518371036831444==--

From hibernate-commits at lists.jboss.org Thu May  1 19:22:18 2008
Content-Type: multipart/mixed; boundary="===============5765743786499467716=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14635 -
 core/branches/Branch_3_2/src/org/hibernate/cache.
Date: Thu, 01 May 2008 19:22:17 -0400
Message-ID: <E1Jri6T-00016i-Uc@committer01.frg.pub.inap.atl.jboss.com>

--===============5765743786499467716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-01 19:22:17 -0400 (Thu, 01 May 2008)
New Revision: 14635

Modified:
   core/branches/Branch_3_2/src/org/hibernate/cache/QueryKey.java
Log:
HHH-2021 : fix fragile QueryKey.equals()


Modified: core/branches/Branch_3_2/src/org/hibernate/cache/QueryKey.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2/src/org/hibernate/cache/QueryKey.java	2008-05-=
01 23:20:39 UTC (rev 14634)
+++ core/branches/Branch_3_2/src/org/hibernate/cache/QueryKey.java	2008-05-=
01 23:22:17 UTC (rev 14635)
@@ -51,6 +51,7 @@
 	}
 	=

 	public boolean equals(Object other) {
+		if ( !( other instanceof QueryKey ) ) return false;
 		QueryKey that =3D (QueryKey) other;
 		if ( !sqlQueryString.equals(that.sqlQueryString) ) return false;
 		if ( !EqualsHelper.equals(firstRow, that.firstRow) || !EqualsHelper.equa=
ls(maxRows, that.maxRows) ) return false;


--===============5765743786499467716==--

From hibernate-commits at lists.jboss.org Fri May  2 16:00:33 2008
Content-Type: multipart/mixed; boundary="===============3356529967708238740=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14636 -
 core/branches/Branch_3_2_4_SP1_CP/etc.
Date: Fri, 02 May 2008 16:00:33 -0400
Message-ID: <E1Js1Qn-00045v-Ob@committer01.frg.pub.inap.atl.jboss.com>

--===============3356529967708238740==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-02 16:00:33 -0400 (Fri, 02 May 2008)
New Revision: 14636

Modified:
   core/branches/Branch_3_2_4_SP1_CP/etc/log4j.properties
Log:
HIBERNATE-89 : Change Hibernate logging to info


Modified: core/branches/Branch_3_2_4_SP1_CP/etc/log4j.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/etc/log4j.properties	2008-05-01 23:22=
:17 UTC (rev 14635)
+++ core/branches/Branch_3_2_4_SP1_CP/etc/log4j.properties	2008-05-02 20:00=
:33 UTC (rev 14636)
@@ -14,8 +14,8 @@
 =

 log4j.rootLogger=3Dwarn, stdout
 =

-#log4j.logger.org.hibernate=3Dinfo
-log4j.logger.org.hibernate=3Ddebug
+log4j.logger.org.hibernate=3Dinfo
+#log4j.logger.org.hibernate=3Ddebug
 =

 ### log HQL query parser activity
 #log4j.logger.org.hibernate.hql.ast.AST=3Ddebug


--===============3356529967708238740==--

From hibernate-commits at lists.jboss.org Fri May  2 17:29:17 2008
Content-Type: multipart/mixed; boundary="===============3015887678245641842=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14637 -
 core/branches/Branch_3_2_4_SP1_CP/lib.
Date: Fri, 02 May 2008 17:29:16 -0400
Message-ID: <E1Js2oe-0006aq-T6@committer01.frg.pub.inap.atl.jboss.com>

--===============3015887678245641842==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-02 17:29:16 -0400 (Fri, 02 May 2008)
New Revision: 14637

Modified:
   core/branches/Branch_3_2_4_SP1_CP/lib/antlr.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/asm-attrs.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/asm.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/cglib.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/commons-collections.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/commons-logging.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/concurrent.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/dom4j.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/javassist.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jaxen.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-cache-jdk50.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-common.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-j2ee.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-jmx.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-minimal.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jboss-system.jar
   core/branches/Branch_3_2_4_SP1_CP/lib/jgroups.jar
Log:
HIBERNATE-92 : Update dependencies to be consistent with EAP 4.2 CP03


Modified: core/branches/Branch_3_2_4_SP1_CP/lib/antlr.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/asm-attrs.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/asm.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/cglib.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/commons-collections.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/commons-logging.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/concurrent.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/dom4j.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/javassist.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jaxen.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-cache-jdk50.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-common.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-j2ee.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-jmx.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-minimal.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jboss-system.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: core/branches/Branch_3_2_4_SP1_CP/lib/jgroups.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============3015887678245641842==--

From hibernate-commits at lists.jboss.org Fri May  2 18:07:59 2008
Content-Type: multipart/mixed; boundary="===============7384996896791567060=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14638 -
 core/branches/Branch_3_2_4_SP1_CP.
Date: Fri, 02 May 2008 18:07:59 -0400
Message-ID: <E1Js3Q7-0007Da-OZ@committer01.frg.pub.inap.atl.jboss.com>

--===============7384996896791567060==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-02 18:07:59 -0400 (Fri, 02 May 2008)
New Revision: 14638

Modified:
   core/branches/Branch_3_2_4_SP1_CP/changelog.txt
   core/branches/Branch_3_2_4_SP1_CP/readme.txt
Log:
HIBERNATE-87 : Correct version numbers and date in readme.txt and changelog=
.txt


Modified: core/branches/Branch_3_2_4_SP1_CP/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/changelog.txt	2008-05-02 21:29:16 UTC=
 (rev 14637)
+++ core/branches/Branch_3_2_4_SP1_CP/changelog.txt	2008-05-02 22:07:59 UTC=
 (rev 14638)
@@ -6,27 +6,33 @@
 more about each case.
 =

 =

-Changes in version 3.2.4.sp1.cp03 (2008.05.01)
+Changes in version 3.2.4.sp1.cp03 (2008.05.02)
 -------------------------------------------
+** Task
+    * [HIBERNATE-92] - Update dependencies to be consistent with EAP 4.2 C=
P03
 =

+
+Changes in version 3.2.4.sp1.cp02 (2008-01-29)
+-------------------------------------------
+
 ** Bug
-    * [HHH-2542] - NullPointerException in TypeFactory.replaceAssociations=
 for ComponentType =

+    * [JBPAPP-357 / HHH-2542] - NullPointerException in TypeFactory.replac=
eAssociations for ComponentType =

 =

 =

-Changes in version 3.2.4.sp1.cp01 (2008.02.01)
+Changes in version 3.2.4.sp1.cp01 (2007-09-13)
 -------------------------------------------
 =

 ** Bug
-    * [HHH-1569] - Immutable Natural Id check fails with ArrayIndexOutOfBo=
unds in some cases
-    * [HHH-2631] - Leaking PreparedStatement and ResultSet via CollectionL=
oadContext instances maintained in Map collectionLoadContexts in LoadContex=
ts
+    * [JBPAPP-740 / HHH-1569] - Immutable Natural Id check fails with Arra=
yIndexOutOfBounds in some cases
+    * [JBPAPP-742 / HHH-2631] - Leaking PreparedStatement and ResultSet vi=
a CollectionLoadContext instances maintained in Map collectionLoadContexts =
in LoadContexts
  =

 ** Improvement
-    * [HHH-2662] - Workaround PostgreSQL issues in testsuite
-    * [HHH-2663] - Map java.sql.Types.REAL to Hibernate FloatType for auto=
-discovery stuff
-    * [HHH-2665] - Split Oracle9Dialect into Oracle9iDialect and Oracle10g=
Dialect
+    * [JBPAPP-741 / HHH-2662] - Workaround PostgreSQL issues in testsuite
+    * [JBPAPP-743 / HHH-2663] - Map java.sql.Types.REAL to Hibernate Float=
Type for auto-discovery stuff
+    * [JBPAPP-744 / HHH-2665] - Split Oracle9Dialect into Oracle9iDialect =
and Oracle10gDialect
 =

 ** Patch
-    * [HHH-2630] - Hibernate Dialect is not auto-detected for Sybase ASE a=
nd DB2 (Shelley McGowan)
+    * [JBPAPP-188 / HHH-2630] - Hibernate Dialect is not auto-detected for=
 Sybase ASE and DB2 (Shelley McGowan)
 =

 =

 Changes in version 3.2.4 (2007.05.18)

Modified: core/branches/Branch_3_2_4_SP1_CP/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/readme.txt	2008-05-02 21:29:16 UTC (r=
ev 14637)
+++ core/branches/Branch_3_2_4_SP1_CP/readme.txt	2008-05-02 22:07:59 UTC (r=
ev 14638)
@@ -1,6 +1,6 @@
 Hibernate - Relational Persistence for Idiomatic Java
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
-version 3.2.4.sp1.cp03, May 1, 2008
+version 3.2.4.sp1.cp03, May 2, 2008
 Copyright =C2=A9 2008 Red Hat, Inc.
 =

 =



--===============7384996896791567060==--

From hibernate-commits at lists.jboss.org Fri May  2 19:25:35 2008
Content-Type: multipart/mixed; boundary="===============1073756561290338422=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14639 -
 core/branches/Branch_3_2_4_SP1_CP.
Date: Fri, 02 May 2008 19:25:34 -0400
Message-ID: <E1Js4dC-000893-0j@committer01.frg.pub.inap.atl.jboss.com>

--===============1073756561290338422==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-02 19:25:33 -0400 (Fri, 02 May 2008)
New Revision: 14639

Modified:
   core/branches/Branch_3_2_4_SP1_CP/readme.txt
Log:
HIBERNATE-88 : Updated readme.txt with installation instructions and expect=
ed test failures


Modified: core/branches/Branch_3_2_4_SP1_CP/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/readme.txt	2008-05-02 22:07:59 UTC (r=
ev 14638)
+++ core/branches/Branch_3_2_4_SP1_CP/readme.txt	2008-05-02 23:25:33 UTC (r=
ev 14639)
@@ -12,24 +12,52 @@
 =

 Required jars are distributed in the lib subdirectory.
 =

+Install Apache Ant 1.7.0 (http://ant.apache.org/) and set ANT_HOME
+environment variable.
 =

+Install JUnit 3.8.1 (http://www.junit.org/) and copy junit.jar to =

+$ANT_HOME/lib. =

+
+
 Get Up And Running Quick
 ------------------------
 Demo:
 =

    (1) copy your JDBC driver to the lib directory
    (2) edit etc/hibernate.properties
-   (3) run "ant eg" or "build eg"
+   (3) run "ant eg" or "build eg" using JDK 1.5
    (4) browse the sourcecode in eg/org/hibernate/auction
 =

 Tests:
 =

    (1) copy your JDBC driver to the lib directory
    (2) edit etc/hibernate.properties
-   (3) run "ant junitreport-dist" or "build junitreport-dist"
+   (3) run "ant junitreport-dist" or "build junitreport-dist" using JDK 1.=
5;
+       to ignore "FailureExpected" failures (see note below), run
+       "ant junitreport-dist -Dhibernate.test.validatefailureexpected=3Dtr=
ue"
    (4) see build/test-reports/index.html
 =

+Note: The unit tests are expected to have 6 failures and 8 errors in:
 =

+Ehcache tests (Ehcache is not provided in this distribution):
+org.hibernate.test.cache.ehcache.EhCacheTest.testQueryCacheInvalidation
+org.hibernate.test.cache.ehcache.EhCacheTest.testEmptySecondLevelCacheEntry
+org.hibernate.test.cache.ehcache.EhCacheTest.testStaleWritesLeaveCacheCons=
istent
+
+"FailureExpected" tests (known issues to be addressed in the future): =

+org.hibernate.test.hql.ASTParserLoadingTest.testParameterTypeMismatchFailu=
reExpected
+org.hibernate.test.hql.CriteriaHQLAlignmentTest.testCriteriaAggregationRet=
urnTypeFailureExpected
+org.hibernate.test.hql.HQLTest.testEmptyInListFailureExpected   =

+org.hibernate.test.hql.HQLTest.testMaxindexHqlFuncttestMultipleElementAcce=
ssorOperatorsFailureExpectedionInElementAccessorFailureExpected
+org.hibernate.test.hql.HQLTest.testMultipleElementAccessorOperatorsFailure=
Expected
+org.hibernate.test.hql.HQLTest.testKeyManyToOneJoinFailureExpected
+org.hibernate.test.hql.HQLTest.testDuplicateExplicitJoinFailureExpected
+org.hibernate.test.keymanytoone.bidir.component.EagerKeyManyToOneTest.test=
LoadEntityWithEagerFetchingToKeyManyToOneReferenceBackToSelfFailureExpected
+org.hibernate.test.legacy.SQLLoaderTest.testReturnPropertyComponentRenameF=
ailureExpected
+org.hibernate.test.readonly.ReadOnlyTest.testReadOnlyOnProxiesFailureExpec=
ted
+org.hibernate.test.sql.hand.query.NativeSQLQueriesTest.testCompositeIdJoin=
sFailureExpected =

+
+
 Product Support and License Website Links
 -----------------------------------------
 Support Processes


--===============1073756561290338422==--

From hibernate-commits at lists.jboss.org Fri May  2 23:30:17 2008
Content-Type: multipart/mixed; boundary="===============8183655352109726861=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14640 - in
 search/trunk/src/java/org/hibernate/search: impl and 1 other directory.
Date: Fri, 02 May 2008 23:30:17 -0400
Message-ID: <E1Js8S1-0004eJ-5E@committer01.frg.pub.inap.atl.jboss.com>

--===============8183655352109726861==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-02 23:30:16 -0400 (Fri, 02 May 2008)
New Revision: 14640

Modified:
   search/trunk/src/java/org/hibernate/search/FullTextSession.java
   search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
Log:
Minor Javadoc

Modified: search/trunk/src/java/org/hibernate/search/FullTextSession.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/FullTextSession.java	2008-05=
-02 23:25:33 UTC (rev 14639)
+++ search/trunk/src/java/org/hibernate/search/FullTextSession.java	2008-05=
-03 03:30:16 UTC (rev 14640)
@@ -21,6 +21,9 @@
 	/**
 	 * Force the (re)indexing of a given <b>managed</b> object.
 	 * Indexation is batched per transaction
+	 * Non indexable entities are ignored
+	 *
+	 * @param entity The entity to index - must not be <code>null</code>.
 	 */
 	void index(Object entity);
 =


Modified: search/trunk/src/java/org/hibernate/search/impl/FullTextSessionIm=
pl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.jav=
a	2008-05-02 23:25:33 UTC (rev 14639)
+++ search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.jav=
a	2008-05-03 03:30:16 UTC (rev 14640)
@@ -128,7 +128,7 @@
 	 * Non indexable entities are ignored
 	 * The entity must be associated with the session
 	 *
-	 * @param entity The neity to index - must not be <code>null</code>.
+	 * @param entity The entity to index - must not be <code>null</code>.
 	 */
 	public void index(Object entity) {
 		if (entity =3D=3D null) return;


--===============8183655352109726861==--

From hibernate-commits at lists.jboss.org Sat May  3 16:11:14 2008
Content-Type: multipart/mixed; boundary="===============4649588401974970898=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14641 -
 core/trunk/core/src/main/java/org/hibernate/dialect.
Date: Sat, 03 May 2008 16:11:13 -0400
Message-ID: <E1JsO4f-0001By-2Z@committer01.frg.pub.inap.atl.jboss.com>

--===============4649588401974970898==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: d.plentz
Date: 2008-05-03 16:11:12 -0400 (Sat, 03 May 2008)
New Revision: 14641

Modified:
   core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java
Log:
[HHH-2683] "datediff" is declared as NoArgSQLFunction in H2Dialect, but act=
ually accepts 3 arguments

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java	2008=
-05-03 03:30:16 UTC (rev 14640)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java	2008=
-05-03 20:11:12 UTC (rev 14641)
@@ -132,7 +132,7 @@
         registerFunction("current_date", new NoArgSQLFunction("current_dat=
e", Hibernate.DATE));
         registerFunction("current_time", new NoArgSQLFunction("current_tim=
e", Hibernate.TIME));
         registerFunction("current_timestamp", new NoArgSQLFunction("curren=
t_timestamp", Hibernate.TIMESTAMP));
-        registerFunction("datediff", new NoArgSQLFunction("datediff", Hibe=
rnate.INTEGER));
+        registerFunction("datediff", new StandardSQLFunction("datediff", H=
ibernate.INTEGER));
         registerFunction("dayname", new StandardSQLFunction("dayname", Hib=
ernate.STRING));
         registerFunction("dayofmonth", new StandardSQLFunction("dayofmonth=
", Hibernate.INTEGER));
         registerFunction("dayofweek", new StandardSQLFunction("dayofweek",=
 Hibernate.INTEGER));


--===============4649588401974970898==--

From hibernate-commits at lists.jboss.org Mon May  5 11:20:23 2008
Content-Type: multipart/mixed; boundary="===============7842789545414361089=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14642 - in search/trunk/src:
 java/org/hibernate/search/impl and 1 other directories.
Date: Mon, 05 May 2008 11:20:23 -0400
Message-ID: <E1Jt2UJ-0000CY-2R@committer01.frg.pub.inap.atl.jboss.com>

--===============7842789545414361089==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-05 11:20:22 -0400 (Mon, 05 May 2008)
New Revision: 14642

Modified:
   search/trunk/src/java/org/hibernate/search/SearchFactory.java
   search/trunk/src/java/org/hibernate/search/impl/InitContext.java
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/Co=
ntact.java
Log:
HSEARCH-195 return analyzer instances by name

Modified: search/trunk/src/java/org/hibernate/search/SearchFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/SearchFactory.java	2008-05-0=
3 20:11:12 UTC (rev 14641)
+++ search/trunk/src/java/org/hibernate/search/SearchFactory.java	2008-05-0=
5 15:20:22 UTC (rev 14642)
@@ -1,8 +1,11 @@
-//$Id: $
+//$Id$
 package org.hibernate.search;
 =

+import java.util.Map;
+
 import org.hibernate.search.reader.ReaderProvider;
 import org.hibernate.search.store.DirectoryProvider;
+import org.apache.lucene.analysis.Analyzer;
 =

 /**
  * Provide application wide operations as well as access to the underlying=
 Lucene resources.
@@ -33,4 +36,12 @@
 	 * Optimize the index holding <code>entityType</code>
 	 */
 	void optimize(Class entityType);
+
+	/**
+	 * Experimental API
+	 * retrieve an analyzer instance by its definition name
+	 * =

+	 * @throws SearchException if the definition name is unknown
+	 */
+	Analyzer getAnalyzer(String name);
 }

Modified: search/trunk/src/java/org/hibernate/search/impl/InitContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/InitContext.java	2008-0=
5-03 20:11:12 UTC (rev 14641)
+++ search/trunk/src/java/org/hibernate/search/impl/InitContext.java	2008-0=
5-05 15:20:22 UTC (rev 14642)
@@ -134,26 +134,34 @@
 		return defaultSimilarity;
 	}
 =

-	public void initLazyAnalyzers() {
-		Map<String, Analyzer> initializedAnalizers =3D new HashMap<String, Analy=
zer>( analyzerDefs.size() );
+	public Map<String, Analyzer> initLazyAnalyzers() {
+		Map<String, Analyzer> initializedAnalyzers =3D new HashMap<String, Analy=
zer>( analyzerDefs.size() );
 =

 		for (DelegateNamedAnalyzer namedAnalyzer : lazyAnalyzers) {
 			String name =3D namedAnalyzer.getName();
-			if ( initializedAnalizers.containsKey( name ) ) {
-				namedAnalyzer.setDelegate( initializedAnalizers.get( name ) );
+			if ( initializedAnalyzers.containsKey( name ) ) {
+				namedAnalyzer.setDelegate( initializedAnalyzers.get( name ) );
 			}
 			else {
 				if ( analyzerDefs.containsKey( name ) ) {
 					final Analyzer analyzer =3D buildAnalyzer( analyzerDefs.get( name ) );
 					namedAnalyzer.setDelegate( analyzer );
-					initializedAnalizers.put( name, analyzer );
+					initializedAnalyzers.put( name, analyzer );
 				}
 				else {
-					//exception
 					throw new SearchException("Analyzer found with an unknown definition:=
 " + name);
 				}
 			}
 		}
+
+		//initialize the remaining definitions
+		for ( Map.Entry<String, AnalyzerDef> entry : analyzerDefs.entrySet() ) {
+			if ( ! initializedAnalyzers.containsKey( entry.getKey() ) ) {
+				final Analyzer analyzer =3D buildAnalyzer( entry.getValue() );
+				initializedAnalyzers.put( entry.getKey(), analyzer );
+			}
+		}
+		return Collections.unmodifiableMap( initializedAnalyzers );
 	}
 =

 	private Analyzer buildAnalyzer(AnalyzerDef analyzerDef) {

Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-03 20:11:12 UTC (rev 14641)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-05 15:20:22 UTC (rev 14642)
@@ -43,6 +43,7 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.DirectoryProviderFactory;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
+import org.apache.lucene.analysis.Analyzer;
 =

 /**
  * @author Emmanuel Bernard
@@ -66,13 +67,14 @@
 	private BackendQueueProcessorFactory backendQueueProcessorFactory;
 	private Map<String, FilterDef> filterDefinitions =3D new HashMap<String, =
FilterDef>();
 	private FilterCachingStrategy filterCachingStrategy;
-	private String indexingStrategy;
+	private Map<String, Analyzer> analyzers;
 =

 	/**
 	 * Each directory provider (index) can have its own performance settings.
 	 */
 	private Map<DirectoryProvider, LuceneIndexingParameters> dirProviderIndex=
ingParams =3D
 		new HashMap<DirectoryProvider, LuceneIndexingParameters>();
+	private String indexingStrategy;
 =

 =

 	public BackendQueueProcessorFactory getBackendQueueProcessorFactory() {
@@ -256,6 +258,12 @@
 		getBackendQueueProcessorFactory().getProcessor( queue ).run();
 	}
 =

+	public Analyzer getAnalyzer(String name) {
+		final Analyzer analyzer =3D analyzers.get( name );
+		if ( analyzer =3D=3D null) throw new SearchException( "Unknown Analyzer =
definition: " + name);
+		return analyzer;
+	}
+
 	private void initDocumentBuilders(Configuration cfg, ReflectionManager re=
flectionManager, InitContext context) {
 		Iterator iter =3D cfg.getClassMappings();
 		DirectoryProviderFactory factory =3D new DirectoryProviderFactory();
@@ -281,7 +289,7 @@
 				}
 			}
 		}
-		context.initLazyAnalyzers();
+		analyzers =3D context.initLazyAnalyzers();
 		factory.startDirectoryProviders();
 	}
 =


Modified: search/trunk/src/test/org/hibernate/search/test/embedded/doublein=
sert/Contact.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/C=
ontact.java	2008-05-03 20:11:12 UTC (rev 14641)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/C=
ontact.java	2008-05-05 15:20:22 UTC (rev 14642)
@@ -22,7 +22,8 @@
 =

 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
 import org.hibernate.annotations.Type;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
@@ -39,7 +40,7 @@
 @Indexed
 public class Contact  implements Serializable {
 =

-	private static Logger logger =3D Logger.getLogger(Contact.class);
+	private static Log logger =3D LogFactory.getLog(Contact.class);
 =

     private static final long serialVersionUID =3D 1L;
 =



--===============7842789545414361089==--

From hibernate-commits at lists.jboss.org Tue May  6 11:47:23 2008
Content-Type: multipart/mixed; boundary="===============3472896594936399733=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14643 -
 core/trunk/cache-jbosscache2.
Date: Tue, 06 May 2008 11:47:23 -0400
Message-ID: <E1JtPNz-0001bo-0d@committer01.frg.pub.inap.atl.jboss.com>

--===============3472896594936399733==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-05-06 11:47:22 -0400 (Tue, 06 May 2008)
New Revision: 14643

Modified:
   core/trunk/cache-jbosscache2/pom.xml
Log:
[HHH-3141] Move to JBoss Cache 2.1.1.GA

Modified: core/trunk/cache-jbosscache2/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/cache-jbosscache2/pom.xml	2008-05-05 15:20:22 UTC (rev 14642)
+++ core/trunk/cache-jbosscache2/pom.xml	2008-05-06 15:47:22 UTC (rev 14643)
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.jboss.cache</groupId>
             <artifactId>jbosscache-core</artifactId>
-            <version>2.1.1.CR2</version> =

+            <version>2.1.1.GA</version> =

         </dependency>
         =

         <!-- test dependencies -->
@@ -196,4 +196,4 @@
             </properties>
         </profile>
      </profiles>
-</project>
\ No newline at end of file
+</project>


--===============3472896594936399733==--

From hibernate-commits at lists.jboss.org Tue May  6 13:25:29 2008
Content-Type: multipart/mixed; boundary="===============0758905966614380033=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14644 - core/trunk/parent.
Date: Tue, 06 May 2008 13:25:29 -0400
Message-ID: <E1JtQuv-0007EX-Eh@committer01.frg.pub.inap.atl.jboss.com>

--===============0758905966614380033==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-06 13:25:29 -0400 (Tue, 06 May 2008)
New Revision: 14644

Modified:
   core/trunk/parent/pom.xml
Log:
HHH-3265 : lgpl license version 2.1

Modified: core/trunk/parent/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/parent/pom.xml	2008-05-06 15:47:22 UTC (rev 14643)
+++ core/trunk/parent/pom.xml	2008-05-06 17:25:29 UTC (rev 14644)
@@ -46,14 +46,13 @@
     <licenses>
         <license>
             <name>GNU Lesser General Public License</name>
-            <url>http://www.gnu.org/copyleft/lesser.html</url>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
             <comments>See discussion at http://hibernate.org/356.html for =
more details.</comments>
             <distribution>repo</distribution>
         </license>
     </licenses>
 =

     <scm>
-        <!-- this is the cloned repo!!! -->
         <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tru=
nk</connection>
         <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate=
/core/trunk</developerConnection>
         <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>


--===============0758905966614380033==--

From hibernate-commits at lists.jboss.org Tue May  6 21:30:42 2008
Content-Type: multipart/mixed; boundary="===============5601223253919158344=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14645 -
 core/branches/Branch_3_2_4_SP1_CP.
Date: Tue, 06 May 2008 21:30:40 -0400
Message-ID: <E1JtYUS-0007Rh-Cx@committer01.frg.pub.inap.atl.jboss.com>

--===============5601223253919158344==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-06 21:30:40 -0400 (Tue, 06 May 2008)
New Revision: 14645

Modified:
   core/branches/Branch_3_2_4_SP1_CP/changelog.txt
Log:
corrected release date to coincide with EAP 4.2 GA


Modified: core/branches/Branch_3_2_4_SP1_CP/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/changelog.txt	2008-05-06 17:25:29 UTC=
 (rev 14644)
+++ core/branches/Branch_3_2_4_SP1_CP/changelog.txt	2008-05-07 01:30:40 UTC=
 (rev 14645)
@@ -19,7 +19,7 @@
     * [JBPAPP-357 / HHH-2542] - NullPointerException in TypeFactory.replac=
eAssociations for ComponentType =

 =

 =

-Changes in version 3.2.4.sp1.cp01 (2007-09-13)
+Changes in version 3.2.4.sp1.cp01 (2007-06-28)
 -------------------------------------------
 =

 ** Bug


--===============5601223253919158344==--

From hibernate-commits at lists.jboss.org Wed May  7 03:22:26 2008
Content-Type: multipart/mixed; boundary="===============0934844825935443136=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14646 - in validator/trunk/src:
 java/org/hibernate/validator/interpolator and 1 other directories.
Date: Wed, 07 May 2008 03:22:26 -0400
Message-ID: <E1Jtdys-0002Jb-RM@committer01.frg.pub.inap.atl.jboss.com>

--===============0934844825935443136==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-07 03:22:26 -0400 (Wed, 07 May 2008)
New Revision: 14646

Added:
   validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMes=
sageInterpolatorAggregator.java
Modified:
   validator/trunk/src/java/org/hibernate/validator/ClassValidator.java
   validator/trunk/src/test/org/hibernate/validator/test/ValidatorTest.java
Log:
test serialiazibility. Make one DefaultMessageInterporatorAggregator transi=
ent, fix class typo

Modified: validator/trunk/src/java/org/hibernate/validator/ClassValidator.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/ClassValidator.java	20=
08-05-07 01:30:40 UTC (rev 14645)
+++ validator/trunk/src/java/org/hibernate/validator/ClassValidator.java	20=
08-05-07 07:22:26 UTC (rev 14646)
@@ -39,7 +39,7 @@
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionMana=
ger;
 import org.hibernate.util.IdentitySet;
-import org.hibernate.validator.interpolator.DefaultMessageInterpolatorAgge=
rator;
+import org.hibernate.validator.interpolator.DefaultMessageInterpolatorAggr=
egator;
 =

 =

 /**
@@ -77,7 +77,7 @@
 	private transient List<Validator> memberValidators;
 	private transient List<XMember> memberGetters;
 	private transient List<XMember> childGetters;
-	private transient DefaultMessageInterpolatorAggerator defaultInterpolator;
+	private transient DefaultMessageInterpolatorAggregator defaultInterpolato=
r;
 	private transient MessageInterpolator userInterpolator;
 	private static final Filter GET_ALL_FILTER =3D new Filter() {
 		public boolean returnStatic() {
@@ -192,7 +192,7 @@
 		memberValidators =3D new ArrayList<Validator>();
 		memberGetters =3D new ArrayList<XMember>();
 		childGetters =3D new ArrayList<XMember>();
-		defaultInterpolator =3D new DefaultMessageInterpolatorAggerator();
+		defaultInterpolator =3D new DefaultMessageInterpolatorAggregator();
 		defaultInterpolator.initialize( messageBundle, defaultMessageBundle );
 =

 		//build the class hierarchy to look for members in

Copied: validator/trunk/src/java/org/hibernate/validator/interpolator/Defau=
ltMessageInterpolatorAggregator.java (from rev 14609, validator/trunk/src/j=
ava/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerato=
r.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolatorAggregator.java	                        (rev 0)
+++ validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolatorAggregator.java	2008-05-07 07:22:26 UTC (rev 14646)
@@ -0,0 +1,57 @@
+//$Id: $
+package org.hibernate.validator.interpolator;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ResourceBundle;
+import java.io.Serializable;
+
+import org.hibernate.validator.MessageInterpolator;
+import org.hibernate.validator.Validator;
+import org.hibernate.AssertionFailure;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class DefaultMessageInterpolatorAggregator implements MessageInterp=
olator, Serializable {
+	private transient Map<Validator, DefaultMessageInterpolator> interpolator=
s =3D new HashMap<Validator, DefaultMessageInterpolator>();
+	//transient but repopulated by the object owing a reference to the interp=
olator
+	private transient ResourceBundle messageBundle;
+	//transient but repopulated by the object owing a reference to the interp=
olator
+	private transient ResourceBundle defaultMessageBundle;
+
+	//not an interface method
+	public void initialize(ResourceBundle messageBundle, ResourceBundle defau=
ltMessageBundle) {
+		this.messageBundle =3D messageBundle;
+		this.defaultMessageBundle =3D defaultMessageBundle;
+		//useful when we deserialize
+		for ( DefaultMessageInterpolator interpolator : interpolators.values() )=
 {
+			interpolator.initialize( messageBundle, defaultMessageBundle );
+		}
+	}
+
+	public void addInterpolator(Annotation annotation, Validator validator) {
+		DefaultMessageInterpolator interpolator =3D new DefaultMessageInterpolat=
or();
+		interpolator.initialize(messageBundle, defaultMessageBundle );
+		interpolator.initialize( annotation, null );
+		interpolators.put( validator, interpolator );
+	}
+
+	public String interpolate(String message, Validator validator, MessageInt=
erpolator defaultInterpolator) {
+		DefaultMessageInterpolator defaultMessageInterpolator =3D interpolators.=
get( validator );
+		if (defaultMessageInterpolator =3D=3D null) {
+			return message;
+		}
+		else {
+			return defaultMessageInterpolator.interpolate( message, validator, defa=
ultInterpolator );
+		}
+	}
+
+	public String getAnnotationMessage(Validator validator) {
+		DefaultMessageInterpolator defaultMessageInterpolator =3D interpolators.=
get( validator );
+		String message =3D defaultMessageInterpolator !=3D null ? defaultMessage=
Interpolator.getAnnotationMessage() : null;
+		if (message =3D=3D null) throw new AssertionFailure("Validator not regis=
tred to the messageInterceptorAggregator");
+		return message;
+	}
+}

Modified: validator/trunk/src/test/org/hibernate/validator/test/ValidatorTe=
st.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/test/org/hibernate/validator/test/ValidatorTest.jav=
a	2008-05-07 01:30:40 UTC (rev 14645)
+++ validator/trunk/src/test/org/hibernate/validator/test/ValidatorTest.jav=
a	2008-05-07 07:22:26 UTC (rev 14646)
@@ -2,6 +2,11 @@
 package org.hibernate.validator.test;
 =

 import java.io.Serializable;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ObjectInputStream;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.Locale;
@@ -140,6 +145,47 @@
 		}
 	}
 =

+	public void testSerialization() throws Exception {
+
+		Tv tv =3D new Tv();
+		tv.serial =3D "FS";
+		tv.name =3D "TooLong";
+		tv.expDate =3D new Date( new Date().getTime() + 1000 * 60 * 60 * 24 * 10=
 );
+		ClassValidator<Tv> classValidator =3D new ClassValidator<Tv>( Tv.class );
+
+		ByteArrayOutputStream stream =3D new ByteArrayOutputStream();
+		ObjectOutput out =3D new ObjectOutputStream( stream );
+		out.writeObject( classValidator );
+		out.close();
+		byte[] serialized =3D stream.toByteArray();
+		stream.close();
+		ByteArrayInputStream byteIn =3D new ByteArrayInputStream( serialized );
+		ObjectInputStream in =3D new ObjectInputStream( byteIn );
+		classValidator  =3D (ClassValidator<Tv>) in.readObject();
+		in.close();
+		byteIn.close();
+
+
+		InvalidValue[] invalidValues =3D classValidator.getInvalidValues( tv );
+		assertEquals( 1, invalidValues.length );
+		Locale loc =3D Locale.getDefault();
+		if ( loc.toString().startsWith( "en" ) ) {
+			assertEquals( "length must be between 0 and 2", invalidValues[0].getMes=
sage() );
+		}
+		else if ( loc.toString().startsWith( "fr" ) ) {
+			String message =3D invalidValues[0].getMessage();
+			String message2 =3D"la longueur doit =EF=BF=BDtre entre 0 et 2";
+			assertEquals( message2, message );
+		}
+		else if ( loc.toString().startsWith( "da" ) ) {
+			assertEquals( "l=EF=BF=BDngden skal v=EF=BF=BDre mellem 0 og 2", invali=
dValues[0].getMessage() );
+		}
+		else {
+			// if default not found then it must be english
+			assertEquals( "length must be between 0 and 2", invalidValues[0].getMes=
sage() );
+		}
+	}
+
 	public class PrefixMessageInterpolator implements MessageInterpolator, Se=
rializable {
 		private String prefix;
 =



--===============0934844825935443136==--

From hibernate-commits at lists.jboss.org Wed May  7 10:31:17 2008
Content-Type: multipart/mixed; boundary="===============8568565611410075486=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14647 -
 validator/trunk/src/java/org/hibernate/validator/interpolator.
Date: Wed, 07 May 2008 10:31:16 -0400
Message-ID: <E1Jtkfs-0007fd-WB@committer01.frg.pub.inap.atl.jboss.com>

--===============8568565611410075486==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-07 10:31:16 -0400 (Wed, 07 May 2008)
New Revision: 14647

Removed:
   validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMes=
sageInterpolatorAggerator.java
Log:
remove class with typo in name

Deleted: validator/trunk/src/java/org/hibernate/validator/interpolator/Defa=
ultMessageInterpolatorAggerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolatorAggerator.java	2008-05-07 07:22:26 UTC (rev 14646)
+++ validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolatorAggerator.java	2008-05-07 14:31:16 UTC (rev 14647)
@@ -1,57 +0,0 @@
-//$Id: $
-package org.hibernate.validator.interpolator;
-
-import java.lang.annotation.Annotation;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ResourceBundle;
-import java.io.Serializable;
-
-import org.hibernate.validator.MessageInterpolator;
-import org.hibernate.validator.Validator;
-import org.hibernate.AssertionFailure;
-
-/**
- * @author Emmanuel Bernard
- */
-public class DefaultMessageInterpolatorAggerator implements MessageInterpo=
lator, Serializable {
-	private Map<Validator, DefaultMessageInterpolator> interpolators =3D new =
HashMap<Validator, DefaultMessageInterpolator>();
-	//transient but repopulated by the object owing a reference to the interp=
olator
-	private transient ResourceBundle messageBundle;
-	//transient but repopulated by the object owing a reference to the interp=
olator
-	private transient ResourceBundle defaultMessageBundle;
-
-	//not an interface method
-	public void initialize(ResourceBundle messageBundle, ResourceBundle defau=
ltMessageBundle) {
-		this.messageBundle =3D messageBundle;
-		this.defaultMessageBundle =3D defaultMessageBundle;
-		//useful when we deserialize
-		for ( DefaultMessageInterpolator interpolator : interpolators.values() )=
 {
-			interpolator.initialize( messageBundle, defaultMessageBundle );
-		}
-	}
-
-	public void addInterpolator(Annotation annotation, Validator validator) {
-		DefaultMessageInterpolator interpolator =3D new DefaultMessageInterpolat=
or();
-		interpolator.initialize(messageBundle, defaultMessageBundle );
-		interpolator.initialize( annotation, null );
-		interpolators.put( validator, interpolator );
-	}
-
-	public String interpolate(String message, Validator validator, MessageInt=
erpolator defaultInterpolator) {
-		DefaultMessageInterpolator defaultMessageInterpolator =3D interpolators.=
get( validator );
-		if (defaultMessageInterpolator =3D=3D null) {
-			return message;
-		}
-		else {
-			return defaultMessageInterpolator.interpolate( message, validator, defa=
ultInterpolator );
-		}
-	}
-
-	public String getAnnotationMessage(Validator validator) {
-		DefaultMessageInterpolator defaultMessageInterpolator =3D interpolators.=
get( validator );
-		String message =3D defaultMessageInterpolator !=3D null ? defaultMessage=
Interpolator.getAnnotationMessage() : null;
-		if (message =3D=3D null) throw new AssertionFailure("Validator not regis=
tred to the messageInterceptorAggregator");
-		return message;
-	}
-}


--===============8568565611410075486==--

From hibernate-commits at lists.jboss.org Wed May  7 14:11:38 2008
Content-Type: multipart/mixed; boundary="===============8719469603190815581=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14648 -
 core/trunk/core/src/main/java/org/hibernate/event.
Date: Wed, 07 May 2008 14:11:38 -0400
Message-ID: <E1Jto78-0008Gi-J0@committer01.frg.pub.inap.atl.jboss.com>

--===============8719469603190815581==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 14:11:38 -0400 (Wed, 07 May 2008)
New Revision: 14648

Modified:
   core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java
Log:
HHH-3261 : fixed wrapping of exception from initialize/destory listeners

Modified: core/trunk/core/src/main/java/org/hibernate/event/EventListeners.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-07 14:31:16 UTC (rev 14647)
+++ core/trunk/core/src/main/java/org/hibernate/event/EventListeners.java	2=
008-05-07 18:11:38 UTC (rev 14648)
@@ -29,7 +29,6 @@
 import java.util.HashMap;
 import java.util.Map;
 =

-import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
@@ -162,19 +161,24 @@
 	private void processListeners(ListenerProcesser processer) {
 		Field[] fields =3D getClass().getDeclaredFields();
 		for ( int i =3D 0; i < fields.length; i++ ) {
+			final Object[] listeners;
 			try {
-				final Object field =3D fields[i].get( this );
-				if ( field instanceof Object[] ) {
-					final Object[] listeners =3D ( Object[] ) field;
-					int length =3D listeners.length;
-					for ( int index =3D 0 ; index < length ; index++ ) {
-						processer.processListener( listeners[index ] );
-					}
+				Object fieldValue =3D fields[i].get(this);
+				if ( fieldValue instanceof Object[] ) {
+					listeners =3D ( Object[] ) fieldValue;
 				}
+				else {
+					continue;
+				}
 			}
-			catch ( Exception e ) {
-				throw new HibernateException( "could not process listeners", e );
+			catch ( Throwable t ) {
+				throw new HibernateException( "could not init listeners", t );
 			}
+
+			int length =3D listeners.length;
+			for ( int index =3D 0 ; index < length ; index++ ) {
+				processer.processListener( listeners[index ] );
+			}
 		}
 	}
 =

@@ -201,6 +205,10 @@
 		}
 	}
 =

+	/**
+	 * Call {@link Destructible#cleanup} on any listeners that implement the
+	 * {@link Destructible} interface.
+	 */
 	public void destroyListeners() {
 		try {
 			processListeners(


--===============8719469603190815581==--

From hibernate-commits at lists.jboss.org Wed May  7 14:26:18 2008
Content-Type: multipart/mixed; boundary="===============6206394678290378336=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14649 - in
 core/trunk/distribution: src/assembly and 1 other directory.
Date: Wed, 07 May 2008 14:26:17 -0400
Message-ID: <E1JtoLJ-0003A9-HU@committer01.frg.pub.inap.atl.jboss.com>

--===============6206394678290378336==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 14:26:17 -0400 (Wed, 07 May 2008)
New Revision: 14649

Modified:
   core/trunk/distribution/pom.xml
   core/trunk/distribution/src/assembly/dist.xml
Log:
HHH-3266, HHH-3267, HHH-3268 : missing deps in dist bundle

Modified: core/trunk/distribution/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/distribution/pom.xml	2008-05-07 18:11:38 UTC (rev 14648)
+++ core/trunk/distribution/pom.xml	2008-05-07 18:26:17 UTC (rev 14649)
@@ -112,6 +112,26 @@
             <artifactId>hibernate-proxool</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- optional deps for bytecode providers since they are optional =
on core -->
+        <dependency>
+            <groupId>javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.4.GA</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>2.1_3</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-attrs</artifactId>
+            <version>1.5.3</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 =

     <profiles>

Modified: core/trunk/distribution/src/assembly/dist.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/distribution/src/assembly/dist.xml	2008-05-07 18:11:38 UTC (=
rev 14648)
+++ core/trunk/distribution/src/assembly/dist.xml	2008-05-07 18:26:17 UTC (=
rev 14649)
@@ -70,10 +70,6 @@
             <includes>
                 <include>antlr:antlr</include>
 =

-                <include>cglib:cglib</include>
-                <include>asm:asm</include>
-                <include>asm:asm-attrs</include>
-
                 <include>commons-collections:commons-collections</include>
 =

                 <include>dom4j:dom4j</include>
@@ -81,6 +77,8 @@
                 <include>javassist:javassist</include>
 =

                 <include>org.slf4j:slf4j-api</include>
+
+                <include>javax.transaction:jta</include>
             </includes>
         </dependencySet>
 =

@@ -137,6 +135,22 @@
                 <include>swarmcache:swarmcache</include>
             </includes>
         </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>lib/bytecode/cglib</outputDirectory>
+            <includes>
+                <include>cglib:cglib</include>
+                <include>asm:asm</include>
+                <include>asm:asm-attrs</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>lib/bytecode/javassist</outputDirectory>
+            <includes>
+                <include>javassist:javassist</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 =

     <fileSets>


--===============6206394678290378336==--

From hibernate-commits at lists.jboss.org Wed May  7 14:27:05 2008
Content-Type: multipart/mixed; boundary="===============0302594346610349234=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14650 -
 core/trunk/documentation/manual.
Date: Wed, 07 May 2008 14:27:05 -0400
Message-ID: <E1JtoM5-0003Cm-JH@committer01.frg.pub.inap.atl.jboss.com>

--===============0302594346610349234==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 14:27:05 -0400 (Wed, 07 May 2008)
New Revision: 14650

Modified:
   core/trunk/documentation/manual/pom.xml
Log:
HHH-3257 : useRelativeImageUris

Modified: core/trunk/documentation/manual/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/pom.xml	2008-05-07 18:26:17 UTC (rev 14=
649)
+++ core/trunk/documentation/manual/pom.xml	2008-05-07 18:27:05 UTC (rev 14=
650)
@@ -92,7 +92,7 @@
                     <options>
                         <xincludeSupported>true</xincludeSupported>
                         <localeSeparator>-</localeSeparator>
-                        <useRelativeImageUris>true</useRelativeImageUris>
+                        <useRelativeImageUris>false</useRelativeImageUris>
                     </options>
                 </configuration>
             </plugin>


--===============0302594346610349234==--

From hibernate-commits at lists.jboss.org Wed May  7 15:53:30 2008
Content-Type: multipart/mixed; boundary="===============6757586719924647465=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14651 -
 core/trunk/documentation/manual.
Date: Wed, 07 May 2008 15:53:30 -0400
Message-ID: <E1Jtphi-0005du-E0@committer01.frg.pub.inap.atl.jboss.com>

--===============6757586719924647465==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 15:53:30 -0400 (Wed, 07 May 2008)
New Revision: 14651

Modified:
   core/trunk/documentation/manual/pom.xml
Log:
HHH-3269 : jDocBook 2.1.1 upgrade

Modified: core/trunk/documentation/manual/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/pom.xml	2008-05-07 18:27:05 UTC (rev 14=
650)
+++ core/trunk/documentation/manual/pom.xml	2008-05-07 19:53:30 UTC (rev 14=
651)
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.jboss.maven.plugins</groupId>
                 <artifactId>maven-jdocbook-plugin</artifactId>
-                <version>2.1.0</version>
+                <version>2.1.1</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>
@@ -53,12 +53,10 @@
                         <translation>es-ES</translation>
 -->
                         <translation>fr-FR</translation>
-<!--
                         <translation>ja-JP</translation>
                         <translation>ko-KR</translation>
                         <translation>pt-BR</translation>
                         <translation>zh-CN</translation>
--->
                     </translations>
                     <imageResource>
                         <directory>${basedir}/src/main/docbook/en-US</dire=
ctory>


--===============6757586719924647465==--

From hibernate-commits at lists.jboss.org Wed May  7 16:59:35 2008
Content-Type: multipart/mixed; boundary="===============4270442594916004501=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14652 - in
 core/trunk/documentation/manual/src/main/docbook: en-US/content and 7 other
 directories.
Date: Wed, 07 May 2008 16:59:35 -0400
Message-ID: <E1Jtqjf-0003WJ-Gl@committer01.frg.pub.inap.atl.jboss.com>

--===============4270442594916004501==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 16:59:35 -0400 (Wed, 07 May 2008)
New Revision: 14652

Modified:
   core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Referen=
ce.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/architect=
ure.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/associati=
on_mapping.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_map=
ping.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/best_prac=
tices.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/collectio=
n_mapping.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/component=
_mapping.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/configura=
tion.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/events.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/example_m=
appings.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/example_p=
arentchild.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/example_w=
eblog.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.x=
ml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/inheritan=
ce_mapping.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/performan=
ce.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/persisten=
t_classes.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.x=
ml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/query_cri=
teria.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hql=
.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql=
.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/session_a=
pi.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_g=
uide.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/transacti=
ons.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.=
xml
   core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml
   core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml
   core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Reference=
.pot
   core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po
Log:
HHH-3270 : documentation license

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_=
Reference.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Refere=
nce.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Refere=
nce.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oas=
is-open.org/docbook/xml/4.5/docbookx.dtd" [
         <!ENTITY versionNumber "3.3.0.CR1">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ar=
chitecture.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/architec=
ture.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/architec=
ture.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/as=
sociation_mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/associat=
ion_mapping.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/associat=
ion_mapping.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ba=
sic_mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_ma=
pping.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_ma=
pping.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ba=
tch.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xm=
l	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xm=
l	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/be=
st_practices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/best_pra=
ctices.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/best_pra=
ctices.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/co=
llection_mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/collecti=
on_mapping.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collecti=
on_mapping.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/co=
mponent_mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/componen=
t_mapping.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/componen=
t_mapping.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/co=
nfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/configur=
ation.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/configur=
ation.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ev=
ents.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/events.x=
ml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/events.x=
ml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ex=
ample_mappings.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
mappings.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
mappings.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ex=
ample_parentchild.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
parentchild.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
parentchild.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/ex=
ample_weblog.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
weblog.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_=
weblog.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/fi=
lters.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.=
xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.=
xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/in=
heritance_mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/inherita=
nce_mapping.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/inherita=
nce_mapping.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/pe=
rformance.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/performa=
nce.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performa=
nce.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/pe=
rsistent_classes.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/persiste=
nt_classes.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/persiste=
nt_classes.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/pr=
eface.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.=
xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.=
xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/qu=
ery_criteria.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_cr=
iteria.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_cr=
iteria.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/qu=
ery_hql.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hq=
l.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hq=
l.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/qu=
ery_sql.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sq=
l.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sq=
l.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/se=
ssion_api.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/session_=
api.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/session_=
api.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/to=
olset_guide.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_=
guide.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_=
guide.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tr=
ansactions.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/transact=
ions.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/transact=
ions.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tu=
torial.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial=
.xml	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial=
.xml	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd" [

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/xm=
l.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.=
oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/legal_noti=
ce.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml=
	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml=
	2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 <!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://=
www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 =

@@ -38,19 +37,16 @@
         </address>
     </para>
     <para>
-        Copyright <trademark class=3D"copyright"/> 2007 by Red Hat, Inc. T=
his material may be distributed only subject to the terms and conditions se=
t forth in the Open Publication License, V1.0 or later (the latest version =
is presently available at <ulink url=3D"http://www.opencontent.org/openpub/=
">http://www.opencontent.org/openpub/</ulink>).
+        Copyright <trademark class=3D"copyright"/> 2007 by Red Hat, Inc.  =
This copyrighted material is made available to
+        anyone wishing to use, modify, copy, or redistribute it subject to=
 the terms and conditions of the
+        GNU <ulink url=3D"http://www.gnu.org/licenses/lgpl-2.1.html">Lesse=
r General Public License</ulink>, as published
+        by the Free Software Foundation.
     </para>
     <para>
-        Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder.
-    </para>
-    <para>
-        Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder.
-    </para>
-    <para>
         Red Hat and the Red Hat "Shadow Man" logo are registered trademark=
s of Red Hat, Inc. in the United States and other countries.
     </para>
     <para>
-    All other trademarks referenced herein are the property of their respe=
ctive owners.
+        All other trademarks referenced herein are the property of their r=
espective owners.
     </para>
     <para>
         The GPG fingerprint of the security(a)redhat.com key is:

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/translator=
s.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -21,7 +21,6 @@
   ~ Free Software Foundation, Inc.
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
-  ~
   -->
 =

 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://=
www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."

Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."

Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."

Modified: core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Re=
ference.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Referenc=
e.pot	2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/pot/Hibernate_Referenc=
e.pot	2008-05-07 20:59:35 UTC (rev 14652)
@@ -1,34 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:23-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ./Hibernate_Reference.xml:33(None) ./Hibernate_Reference.xml:36(None) =

-msgid "@@image: 'images/hibernate_logo_a.png'; md5=3D38bd6cfd79e676660440f=
316f4ab452c"
-msgstr ""
-
-#: ./Hibernate_Reference.xml:26(title) =

-msgid "HIBERNATE - Relational Persistence for Idiomatic Java"
-msgstr ""
-
-#: ./Hibernate_Reference.xml:27(subtitle) =

-msgid "Hibernate Reference Documentation"
-msgstr ""
-
-#: ./Hibernate_Reference.xml:30(issuenum) =

-msgid "1"
-msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ./Hibernate_Reference.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."

Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_noti=
ce.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po	=
2008-05-07 19:53:30 UTC (rev 14651)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/legal_notice.po	=
2008-05-07 20:59:35 UTC (rev 14652)
@@ -13,17 +13,9 @@
 msgstr "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>N=
C</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone=
: +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 9=
19 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city=
>, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 =

 #: index.docbook:31
-msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This material may be distributed only subject to the terms and c=
onditions set forth in the Open Publication License, V1.0 or later (the lat=
est version is presently available at <ulink url=3D\"http://www.opencontent=
.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc. This material may be distributed only subject to the terms and =
conditions set forth in the Open Publication License, V1.0 or later (the la=
test version is presently available at <ulink url=3D\"http://www.openconten=
t.org/openpub/\">http://www.opencontent.org/openpub/</ulink>)."
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc.  This copyrighted material is made available to anyone wishing t=
o use, modify, copy, or redistribute it subject to the terms and conditions=
 of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Less=
er General Public License</ulink>, as published by the Free Software Founda=
tion."
+msgstr "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Re=
d Hat, Inc.  This copyrighted material is made available to anyone wishing =
to use, modify, copy, or redistribute it subject to the terms and condition=
s of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Les=
ser General Public License</ulink>, as published by the Free Software Found=
ation."
 =

-#: index.docbook:34
-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr "Distribution of substantively modified versions of this document i=
s prohibited without the explicit permission of the copyright holder."
-
-#: index.docbook:37
-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr "Distribution of the work or derivative of the work in any standard=
 (paper) book form for commercial purposes is prohibited unless prior permi=
ssion is obtained from the copyright holder."
-
 #: index.docbook:40
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr "Red Hat and the Red Hat \"Shadow Man\" logo are registered tradema=
rks of Red Hat, Inc. in the United States and other countries."


--===============4270442594916004501==--

From hibernate-commits at lists.jboss.org Wed May  7 17:02:37 2008
Content-Type: multipart/mixed; boundary="===============2751703871400288007=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14653 - in
 core/trunk/documentation/manual/src/main/docbook/pot: content and 1 other
 directory.
Date: Wed, 07 May 2008 17:02:36 -0400
Message-ID: <E1Jtqma-0004mB-AA@committer01.frg.pub.inap.atl.jboss.com>

--===============2751703871400288007==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 17:02:35 -0400 (Wed, 07 May 2008)
New Revision: 14653

Modified:
   core/trunk/documentation/manual/src/main/docbook/pot/content/architectur=
e.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/association=
_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mappi=
ng.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/best_practi=
ces.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/collection_=
mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/component_m=
apping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/configurati=
on.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_map=
pings.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_par=
entchild.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/example_web=
log.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance=
_mapping.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/performance=
.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_=
classes.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_crite=
ria.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.p=
ot
   core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.p=
ot
   core/trunk/documentation/manual/src/main/docbook/pot/content/session_api=
.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_gui=
de.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/transaction=
s.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot
   core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot
   core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot
Log:
HHH-3270 : documentation license

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/arch=
itecture.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/architectu=
re.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/architectu=
re.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,256 +1,322 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:28-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:32(None) =

-msgid "@@image: '../images/overview.svg'; md5=3D2d9211eace02ecef615f7dd42b=
eec14c"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:35(None) =

-msgid "@@image: '../images/overview.png'; md5=3Da2b5f0f7dc75d9773305d4d824=
880e8c"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:54(None) =

-msgid "@@image: '../images/lite.svg'; md5=3D2178e70b3b165736d33b085dcad936=
99"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:57(None) =

-msgid "@@image: '../images/lite.png'; md5=3D7dd864188937e2dfef42a706235f74=
c3"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:68(None) =

-msgid "@@image: '../images/full_cream.svg'; md5=3D4ef192f03e90e451e5dcb287=
d2709687"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: architecture.xml:71(None) =

-msgid "@@image: '../images/full_cream.png'; md5=3Dc3ee197b49364a876bc5867d=
5c2c6db7"
-msgstr ""
-
-#: architecture.xml:21(title) =

+#. Tag: title
+#: architecture.xml:30
+#, no-c-format
 msgid "Architecture"
 msgstr ""
 =

-#: architecture.xml:24(title) =

+#. Tag: title
+#: architecture.xml:33
+#, no-c-format
 msgid "Overview"
 msgstr ""
 =

-#: architecture.xml:26(para) =

+#. Tag: para
+#: architecture.xml:35
+#, no-c-format
 msgid "A (very) high-level view of the Hibernate architecture:"
 msgstr ""
 =

-#: architecture.xml:39(para) =

+#. Tag: para
+#: architecture.xml:48
+#, no-c-format
 msgid "This diagram shows Hibernate using the database and configuration d=
ata to provide persistence services (and persistent objects) to the applica=
tion."
 msgstr ""
 =

-#: architecture.xml:44(para) =

+#. Tag: para
+#: architecture.xml:53
+#, no-c-format
 msgid "We would like to show a more detailed view of the runtime architect=
ure. Unfortunately, Hibernate is flexible and supports several approaches. =
We will show the two extremes. The \"lite\" architecture has the applicatio=
n provide its own JDBC connections and manage its own transactions. This ap=
proach uses a minimal subset of Hibernate's APIs:"
 msgstr ""
 =

-#: architecture.xml:61(para) =

+#. Tag: para
+#: architecture.xml:70
+#, no-c-format
 msgid "The \"full cream\" architecture abstracts the application away from=
 the underlying JDBC/JTA APIs and lets Hibernate take care of the details."
 msgstr ""
 =

-#: architecture.xml:80(term) =

+#. Tag: para
+#: architecture.xml:84
+#, no-c-format
+msgid "Heres some definitions of the objects in the diagrams:"
+msgstr ""
+
+#. Tag: term
+#: architecture.xml:89
+#, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr ""
 =

-#: architecture.xml:82(para) =

+#. Tag: para
+#: architecture.xml:91
+#, no-c-format
 msgid "A threadsafe (immutable) cache of compiled mappings for a single da=
tabase. A factory for <literal>Session</literal> and a client of <literal>C=
onnectionProvider</literal>. Might hold an optional (second-level) cache of=
 data that is reusable between transactions, at a process- or cluster-level=
."
 msgstr ""
 =

-#: architecture.xml:92(term) =

+#. Tag: term
+#: architecture.xml:101
+#, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr ""
 =

-#: architecture.xml:94(para) =

+#. Tag: para
+#: architecture.xml:103
+#, no-c-format
 msgid "A single-threaded, short-lived object representing a conversation b=
etween the application and the persistent store. Wraps a JDBC connection. F=
actory for <literal>Transaction</literal>. Holds a mandatory (first-level) =
cache of persistent objects, used when navigating the object graph or looki=
ng up objects by identifier."
 msgstr ""
 =

-#: architecture.xml:104(term) =

+#. Tag: term
+#: architecture.xml:113
+#, no-c-format
 msgid "Persistent objects and collections"
 msgstr ""
 =

-#: architecture.xml:106(para) =

+#. Tag: para
+#: architecture.xml:115
+#, no-c-format
 msgid "Short-lived, single threaded objects containing persistent state an=
d business function. These might be ordinary JavaBeans/POJOs, the only spec=
ial thing about them is that they are currently associated with (exactly on=
e) <literal>Session</literal>. As soon as the <literal>Session</literal> is=
 closed, they will be detached and free to use in any application layer (e.=
g. directly as data transfer objects to and from presentation)."
 msgstr ""
 =

-#: architecture.xml:117(term) =

+#. Tag: term
+#: architecture.xml:126
+#, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr ""
 =

-#: architecture.xml:119(para) =

+#. Tag: para
+#: architecture.xml:128
+#, no-c-format
 msgid "Instances of persistent classes that are not currently associated w=
ith a <literal>Session</literal>. They may have been instantiated by the ap=
plication and not (yet) persisted or they may have been instantiated by a c=
losed <literal>Session</literal>."
 msgstr ""
 =

-#: architecture.xml:128(term) =

+#. Tag: term
+#: architecture.xml:137
+#, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr ""
 =

-#: architecture.xml:130(para) =

+#. Tag: para
+#: architecture.xml:139
+#, no-c-format
 msgid "(Optional) A single-threaded, short-lived object used by the applic=
ation to specify atomic units of work. Abstracts application from underlyin=
g JDBC, JTA or CORBA transaction. A <literal>Session</literal> might span s=
everal <literal>Transaction</literal>s in some cases. However, transaction =
demarcation, either using the underlying API or <literal>Transaction</liter=
al>, is never optional!"
 msgstr ""
 =

-#: architecture.xml:141(term) =

+#. Tag: term
+#: architecture.xml:150
+#, no-c-format
 msgid "ConnectionProvider (<literal>org.hibernate.connection.ConnectionPro=
vider</literal>)"
 msgstr ""
 =

-#: architecture.xml:143(para) =

+#. Tag: para
+#: architecture.xml:152
+#, no-c-format
 msgid "(Optional) A factory for (and pool of) JDBC connections. Abstracts =
application from underlying <literal>Datasource</literal> or <literal>Drive=
rManager</literal>. Not exposed to application, but can be extended/impleme=
nted by the developer."
 msgstr ""
 =

-#: architecture.xml:151(term) =

+#. Tag: term
+#: architecture.xml:160
+#, no-c-format
 msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</lite=
ral>)"
 msgstr ""
 =

-#: architecture.xml:153(para) =

+#. Tag: para
+#: architecture.xml:162
+#, no-c-format
 msgid "(Optional) A factory for <literal>Transaction</literal> instances. =
Not exposed to the application, but can be extended/implemented by the deve=
loper."
 msgstr ""
 =

-#: architecture.xml:160(emphasis) =

+#. Tag: emphasis
+#: architecture.xml:169
+#, no-c-format
 msgid "Extension Interfaces"
 msgstr ""
 =

-#: architecture.xml:162(para) =

+#. Tag: para
+#: architecture.xml:171
+#, no-c-format
 msgid "Hibernate offers many optional extension interfaces you can impleme=
nt to customize the behavior of your persistence layer. See the API documen=
tation for details."
 msgstr ""
 =

-#: architecture.xml:75(para) =

-msgid "Heres some definitions of the objects in the diagrams: <placeholder=
-1/>"
-msgstr ""
-
-#: architecture.xml:171(para) =

+#. Tag: para
+#: architecture.xml:180
+#, no-c-format
 msgid "Given a \"lite\" architecture, the application bypasses the <litera=
l>Transaction</literal>/<literal>TransactionFactory</literal> and/or <liter=
al>ConnectionProvider</literal> APIs to talk to JTA or JDBC directly."
 msgstr ""
 =

-#: architecture.xml:179(title) =

+#. Tag: title
+#: architecture.xml:188
+#, no-c-format
 msgid "Instance states"
 msgstr ""
 =

-#: architecture.xml:180(para) =

+#. Tag: para
+#: architecture.xml:189
+#, no-c-format
 msgid "An instance of a persistent classes may be in one of three differen=
t states, which are defined with respect to a <emphasis>persistence context=
</emphasis>. The Hibernate <literal>Session</literal> object is the persist=
ence context:"
 msgstr ""
 =

-#: architecture.xml:188(term) =

+#. Tag: term
+#: architecture.xml:197
+#, no-c-format
 msgid "transient"
 msgstr ""
 =

-#: architecture.xml:190(para) =

+#. Tag: para
+#: architecture.xml:199
+#, no-c-format
 msgid "The instance is not, and has never been associated with any persist=
ence context. It has no persistent identity (primary key value)."
 msgstr ""
 =

-#: architecture.xml:198(term) =

+#. Tag: term
+#: architecture.xml:207
+#, no-c-format
 msgid "persistent"
 msgstr ""
 =

-#: architecture.xml:200(para) =

+#. Tag: para
+#: architecture.xml:209
+#, no-c-format
 msgid "The instance is currently associated with a persistence context. It=
 has a persistent identity (primary key value) and, perhaps, a correspondin=
g row in the database. For a particular persistence context, Hibernate <emp=
hasis>guarantees</emphasis> that persistent identity is equivalent to Java =
identity (in-memory location of the object)."
 msgstr ""
 =

-#: architecture.xml:212(term) =

+#. Tag: term
+#: architecture.xml:221
+#, no-c-format
 msgid "detached"
 msgstr ""
 =

-#: architecture.xml:214(para) =

-msgid "The instance was once associated with a persistence context, but th=
at context was closed, or the instance was serialized to another process. I=
t has a persistent identity and, perhaps, a corrsponding row in the databas=
e. For detached instances, Hibernate makes no guarantees about the relation=
ship between persistent identity and Java identity."
+#. Tag: para
+#: architecture.xml:223
+#, no-c-format
+msgid "The instance was once associated with a persistence context, but th=
at context was closed, or the instance was serialized to another process. I=
t has a persistent identity and, perhaps, a corresponding row in the databa=
se. For detached instances, Hibernate makes no guarantees about the relatio=
nship between persistent identity and Java identity."
 msgstr ""
 =

-#: architecture.xml:229(title) =

+#. Tag: title
+#: architecture.xml:238
+#, no-c-format
 msgid "JMX Integration"
 msgstr ""
 =

-#: architecture.xml:231(para) =

+#. Tag: para
+#: architecture.xml:240
+#, no-c-format
 msgid "JMX is the J2EE standard for management of Java components. Hiberna=
te may be managed via a JMX standard service. We provide an MBean implement=
ation in the distribution, <literal>org.hibernate.jmx.HibernateService</lit=
eral>."
 msgstr ""
 =

-#: architecture.xml:237(para) =

+#. Tag: para
+#: architecture.xml:246
+#, no-c-format
 msgid "For an example how to deploy Hibernate as a JMX service on the JBos=
s Application Server, please see the JBoss User Guide. On JBoss AS, you als=
o get these benefits if you deploy using JMX:"
 msgstr ""
 =

-#: architecture.xml:245(para) =

+#. Tag: para
+#: architecture.xml:254
+#, no-c-format
 msgid "<emphasis>Session Management:</emphasis> The Hibernate <literal>Ses=
sion</literal>'s life cycle can be automatically bound to the scope of a JT=
A transaction. This means you no longer have to manually open and close the=
 <literal>Session</literal>, this becomes the job of a JBoss EJB intercepto=
r. You also don't have to worry about transaction demarcation in your code =
anymore (unless you'd like to write a portable persistence layer of course,=
 use the optional Hibernate <literal>Transaction</literal> API for this). Y=
ou call the <literal>HibernateContext</literal> to access a <literal>Sessio=
n</literal>."
 msgstr ""
 =

-#: architecture.xml:257(para) =

+#. Tag: para
+#: architecture.xml:266
+#, no-c-format
 msgid "<emphasis>HAR deployment:</emphasis> Usually you deploy the Hiberna=
te JMX service using a JBoss service deployment descriptor (in an EAR and/o=
r SAR file), it supports all the usual configuration options of a Hibernate=
 <literal>SessionFactory</literal>. However, you still have to name all you=
r mapping files in the deployment descriptor. If you decide to use the opti=
onal HAR deployment, JBoss will automatically detect all mapping files in y=
our HAR file."
 msgstr ""
 =

-#: architecture.xml:268(para) =

+#. Tag: para
+#: architecture.xml:277
+#, no-c-format
 msgid "Consult the JBoss AS user guide for more information about these op=
tions."
 msgstr ""
 =

-#: architecture.xml:272(para) =

+#. Tag: para
+#: architecture.xml:281
+#, no-c-format
 msgid "Another feature available as a JMX service are runtime Hibernate st=
atistics. See <xref linkend=3D\"configuration-optional-statistics\"/>."
 msgstr ""
 =

-#: architecture.xml:279(title) =

+#. Tag: title
+#: architecture.xml:288
+#, no-c-format
 msgid "JCA Support"
 msgstr ""
 =

-#: architecture.xml:280(para) =

+#. Tag: para
+#: architecture.xml:289
+#, no-c-format
 msgid "Hibernate may also be configured as a JCA connector. Please see the=
 website for more details. Please note that Hibernate JCA support is still =
considered experimental."
 msgstr ""
 =

-#: architecture.xml:287(title) =

+#. Tag: title
+#: architecture.xml:296
+#, no-c-format
 msgid "Contextual Sessions"
 msgstr ""
 =

-#: architecture.xml:288(para) =

+#. Tag: para
+#: architecture.xml:297
+#, no-c-format
 msgid "Most applications using Hibernate need some form of \"contextual\" =
sessions, where a given session is in effect throughout the scope of a give=
n context. However, across applications the definition of what constitutes =
a context is typically different; and different contexts define different s=
copes to the notion of current. Applications using Hibernate prior to versi=
on 3.0 tended to utilize either home-grown <literal>ThreadLocal</literal>-b=
ased contextual sessions, helper classes such as <literal>HibernateUtil</li=
teral>, or utilized third-party frameworks (such as Spring or Pico) which p=
rovided proxy/interception-based contextual sessions."
 msgstr ""
 =

-#: architecture.xml:297(para) =

+#. Tag: para
+#: architecture.xml:306
+#, no-c-format
 msgid "Starting with version 3.0.1, Hibernate added the <literal>SessionFa=
ctory.getCurrentSession()</literal> method. Initially, this assumed usage o=
f <literal>JTA</literal> transactions, where the <literal>JTA</literal> tra=
nsaction defined both the scope and context of a current session. The Hiber=
nate team maintains that, given the maturity of the numerous stand-alone <l=
iteral>JTA TransactionManager</literal> implementations out there, most (if=
 not all) applications should be using <literal>JTA</literal> transaction m=
anagement whether or not they are deployed into a <literal>J2EE</literal> c=
ontainer. Based on that, the <literal>JTA</literal>-based contextual sessio=
ns is all you should ever need to use."
 msgstr ""
 =

-#: architecture.xml:307(para) =

+#. Tag: para
+#: architecture.xml:316
+#, no-c-format
 msgid "However, as of version 3.1, the processing behind <literal>SessionF=
actory.getCurrentSession()</literal> is now pluggable. To that end, a new e=
xtension interface (<literal>org.hibernate.context.CurrentSessionContext</l=
iteral>) and a new configuration parameter (<literal>hibernate.current_sess=
ion_context_class</literal>) have been added to allow pluggability of the s=
cope and context of defining current sessions."
 msgstr ""
 =

-#: architecture.xml:314(para) =

+#. Tag: para
+#: architecture.xml:323
+#, no-c-format
 msgid "See the Javadocs for the <literal>org.hibernate.context.CurrentSess=
ionContext</literal> interface for a detailed discussion of its contract. I=
t defines a single method, <literal>currentSession()</literal>, by which th=
e implementation is responsible for tracking the current contextual session=
. Out-of-the-box, Hibernate comes with three implementations of this interf=
ace."
 msgstr ""
 =

-#: architecture.xml:324(para) =

+#. Tag: para
+#: architecture.xml:333
+#, no-c-format
 msgid "<literal>org.hibernate.context.JTASessionContext</literal> - curren=
t sessions are tracked and scoped by a <literal>JTA</literal> transaction. =
The processing here is exactly the same as in the older JTA-only approach. =
See the Javadocs for details."
 msgstr ""
 =

-#: architecture.xml:332(para) =

+#. Tag: para
+#: architecture.xml:341
+#, no-c-format
 msgid "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> =
- current sessions are tracked by thread of execution. Again, see the Javad=
ocs for details."
 msgstr ""
 =

-#: architecture.xml:338(para) =

+#. Tag: para
+#: architecture.xml:347
+#, no-c-format
 msgid "<literal>org.hibernate.context.ManagedSessionContext</literal> - cu=
rrent sessions are tracked by thread of execution. However, you are respons=
ible to bind and unbind a <literal>Session</literal> instance with static m=
ethods on this class, it does never open, flush, or close a <literal>Sessio=
n</literal>."
 msgstr ""
 =

-#: architecture.xml:347(para) =

-msgid "The first two implementations provide a \"one session - one databas=
e transaction\" programming model, also known and used as <emphasis>session=
-per-request</emphasis>. The beginning and end of a Hibernate session is de=
fined by the duration of a database transaction. If you use programatic tra=
nsaction demarcation in plain JSE without JTA, you are adviced to use the H=
ibernate <literal>Transaction</literal> API to hide the underlying transact=
ion system from your code. If you use JTA, use the JTA interfaces to demarc=
ate transactions. If you execute in an EJB container that supports CMT, tra=
nsaction boundaries are defined declaratively and you don't need any transa=
ction or session demarcation operations in your code. Refer to <xref linken=
d=3D\"transactions\"/> for more information and code examples."
+#. Tag: para
+#: architecture.xml:356
+#, no-c-format
+msgid "The first two implementations provide a \"one session - one databas=
e transaction\" programming model, also known and used as <emphasis>session=
-per-request</emphasis>. The beginning and end of a Hibernate session is de=
fined by the duration of a database transaction. If you use programmatic tr=
ansaction demarcation in plain JSE without JTA, you are advised to use the =
Hibernate <literal>Transaction</literal> API to hide the underlying transac=
tion system from your code. If you use JTA, use the JTA interfaces to demar=
cate transactions. If you execute in an EJB container that supports CMT, tr=
ansaction boundaries are defined declaratively and you don't need any trans=
action or session demarcation operations in your code. Refer to <xref linke=
nd=3D\"transactions\"/> for more information and code examples."
 msgstr ""
 =

-#: architecture.xml:359(para) =

+#. Tag: para
+#: architecture.xml:368
+#, no-c-format
 msgid "The <literal>hibernate.current_session_context_class</literal> conf=
iguration parameter defines which <literal>org.hibernate.context.CurrentSes=
sionContext</literal> implementation should be used. Note that for backward=
s compatibility, if this config param is not set but a <literal>org.hiberna=
te.transaction.TransactionManagerLookup</literal> is configured, Hibernate =
will use the <literal>org.hibernate.context.JTASessionContext</literal>. Ty=
pically, the value of this parameter would just name the implementation cla=
ss to use; for the three out-of-the-box implementations, however, there are=
 three corresponding short names, \"jta\", \"thread\", and \"managed\"."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: architecture.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/asso=
ciation_mapping.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/associatio=
n_mapping.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/associatio=
n_mapping.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,160 +1,738 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:28-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: association_mapping.xml:6(title) =

+#. Tag: title
+#: association_mapping.xml:30
+#, no-c-format
 msgid "Association Mappings"
 msgstr ""
 =

-#: association_mapping.xml:9(title) =

+#. Tag: title
+#: association_mapping.xml:33
+#, no-c-format
 msgid "Introduction"
 msgstr ""
 =

-#: association_mapping.xml:11(para) =

+#. Tag: para
+#: association_mapping.xml:35
+#, no-c-format
 msgid "Association mappings are the often most difficult thing to get righ=
t. In this section we'll go through the canonical cases one by one, startin=
g with unidirectional mappings, and then considering the bidirectional case=
s. We'll use <literal>Person</literal> and <literal>Address</literal> in al=
l the examples."
 msgstr ""
 =

-#: association_mapping.xml:19(para) =

+#. Tag: para
+#: association_mapping.xml:43
+#, no-c-format
 msgid "We'll classify associations by whether or not they map to an interv=
ening join table, and by multiplicity."
 msgstr ""
 =

-#: association_mapping.xml:24(para) =

+#. Tag: para
+#: association_mapping.xml:48
+#, no-c-format
 msgid "Nullable foreign keys are not considered good practice in tradition=
al data modelling, so all our examples use not null foreign keys. This is n=
ot a requirement of Hibernate, and the mappings will all work if you drop t=
he nullability constraints."
 msgstr ""
 =

-#: association_mapping.xml:34(title) =

+#. Tag: title
+#: association_mapping.xml:58
+#, no-c-format
 msgid "Unidirectional associations"
 msgstr ""
 =

-#: association_mapping.xml:37(title) association_mapping.xml:195(title) =

+#. Tag: title
+#: association_mapping.xml:61 association_mapping.xml:132
+#, no-c-format
 msgid "many to one"
 msgstr ""
 =

-#: association_mapping.xml:39(para) =

+#. Tag: para
+#: association_mapping.xml:63
+#, no-c-format
 msgid "A <emphasis>unidirectional many-to-one association</emphasis> is th=
e most common kind of unidirectional association."
 msgstr ""
 =

-#: association_mapping.xml:66(title) association_mapping.xml:229(title) as=
sociation_mapping.xml:373(title) association_mapping.xml:479(title) =

+#. Tag: programlisting
+#: association_mapping.xml:68
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <many-to-one name=3D\"address\" \n"
+      "        column=3D\"addressId\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:69 association_mapping.xml:185
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key, address=
Id bigint not null )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:74 association_mapping.xml:145 association_mapp=
ing.xml:209 association_mapping.xml:249
+#, no-c-format
 msgid "one to one"
 msgstr ""
 =

-#: association_mapping.xml:68(para) =

+#. Tag: para
+#: association_mapping.xml:76
+#, no-c-format
 msgid "A <emphasis>unidirectional one-to-one association on a foreign key<=
/emphasis> is almost identical. The only difference is the column unique co=
nstraint."
 msgstr ""
 =

-#: association_mapping.xml:93(para) =

+#. Tag: programlisting
+#: association_mapping.xml:81
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <many-to-one name=3D\"address\" \n"
+      "        column=3D\"addressId\" \n"
+      "        unique=3D\"true\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:82 association_mapping.xml:217
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key, address=
Id bigint not null unique )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:84
+#, no-c-format
 msgid "A <emphasis>unidirectional one-to-one association on a primary key<=
/emphasis> usually uses a special id generator. (Notice that we've reversed=
 the direction of the association in this example.)"
 msgstr ""
 =

-#: association_mapping.xml:121(title) association_mapping.xml:161(title) =

+#. Tag: programlisting
+#: association_mapping.xml:90
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"foreign\">\n"
+      "            <param name=3D\"property\">person</param>\n"
+      "        </generator>\n"
+      "    </id>\n"
+      "    <one-to-one name=3D\"person\" constrained=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:91 association_mapping.xml:225
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table Address ( personId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:96 association_mapping.xml:118
+#, no-c-format
 msgid "one to many"
 msgstr ""
 =

-#: association_mapping.xml:123(para) =

+#. Tag: para
+#: association_mapping.xml:98
+#, no-c-format
 msgid "A <emphasis>unidirectional one-to-many association on a foreign key=
</emphasis> is a very unusual case, and is not really recommended."
 msgstr ""
 =

-#: association_mapping.xml:149(para) =

+#. Tag: programlisting
+#: association_mapping.xml:103
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"addresses\">\n"
+      "        <key column=3D\"personId\" \n"
+      "            not-null=3D\"true\"/>\n"
+      "        <one-to-many class=3D\"Address\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:104
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table Address ( addressId bigint not null primary key, perso=
nId bigint not null )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:106
+#, no-c-format
 msgid "We think it's better to use a join table for this kind of associati=
on."
 msgstr ""
 =

-#: association_mapping.xml:158(title) =

+#. Tag: title
+#: association_mapping.xml:115
+#, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr ""
 =

-#: association_mapping.xml:163(para) =

+#. Tag: para
+#: association_mapping.xml:120
+#, no-c-format
 msgid "A <emphasis>unidirectional one-to-many association on a join table<=
/emphasis> is much preferred. Notice that by specifying <literal>unique=3D\=
"true\"</literal>, we have changed the multiplicity from many-to-many to on=
e-to-many."
 msgstr ""
 =

-#: association_mapping.xml:197(para) =

+#. Tag: programlisting
+#: association_mapping.xml:126
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"addresses\" table=3D\"PersonAddress\">\n"
+      "        <key column=3D\"personId\"/>\n"
+      "        <many-to-many column=3D\"addressId\"\n"
+      "            unique=3D\"true\"\n"
+      "            class=3D\"Address\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:127
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table PersonAddress ( personId not null, addressId bigint no=
t null primary key )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:134
+#, no-c-format
 msgid "A <emphasis>unidirectional many-to-one association on a join table<=
/emphasis> is quite common when the association is optional."
 msgstr ""
 =

-#: association_mapping.xml:231(para) =

+#. Tag: programlisting
+#: association_mapping.xml:139
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <join table=3D\"PersonAddress\" \n"
+      "        optional=3D\"true\">\n"
+      "        <key column=3D\"personId\" unique=3D\"true\"/>\n"
+      "        <many-to-one name=3D\"address\"\n"
+      "            column=3D\"addressId\" \n"
+      "            not-null=3D\"true\"/>\n"
+      "    </join>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:140
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table PersonAddress ( personId bigint not null primary key, =
addressId bigint not null )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:147
+#, no-c-format
 msgid "A <emphasis>unidirectional one-to-one association on a join table</=
emphasis> is extremely unusual, but possible."
 msgstr ""
 =

-#: association_mapping.xml:265(title) association_mapping.xml:525(title) =

+#. Tag: programlisting
+#: association_mapping.xml:152
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <join table=3D\"PersonAddress\" \n"
+      "        optional=3D\"true\">\n"
+      "        <key column=3D\"personId\" \n"
+      "            unique=3D\"true\"/>\n"
+      "        <many-to-one name=3D\"address\"\n"
+      "            column=3D\"addressId\" \n"
+      "            not-null=3D\"true\"\n"
+      "            unique=3D\"true\"/>\n"
+      "    </join>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:153 association_mapping.xml:257
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table PersonAddress ( personId bigint not null primary key, =
addressId bigint not null unique )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:158 association_mapping.xml:262
+#, no-c-format
 msgid "many to many"
 msgstr ""
 =

-#: association_mapping.xml:267(para) =

+#. Tag: para
+#: association_mapping.xml:160
+#, no-c-format
 msgid "Finally, we have a <emphasis>unidirectional many-to-many associatio=
n</emphasis>."
 msgstr ""
 =

-#: association_mapping.xml:298(title) =

+#. Tag: programlisting
+#: association_mapping.xml:164
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"addresses\" table=3D\"PersonAddress\">\n"
+      "        <key column=3D\"personId\"/>\n"
+      "        <many-to-many column=3D\"addressId\"\n"
+      "            class=3D\"Address\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:165 association_mapping.xml:270
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table PersonAddress ( personId bigint not null, addressId bi=
gint not null, primary key (personId, addressId) )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:172
+#, no-c-format
 msgid "Bidirectional associations"
 msgstr ""
 =

-#: association_mapping.xml:301(title) association_mapping.xml:436(title) =

+#. Tag: title
+#: association_mapping.xml:175 association_mapping.xml:235
+#, no-c-format
 msgid "one to many / many to one"
 msgstr ""
 =

-#: association_mapping.xml:303(para) =

+#. Tag: para
+#: association_mapping.xml:177
+#, no-c-format
 msgid "A <emphasis>bidirectional many-to-one association</emphasis> is the=
 most common kind of association. (This is the standard parent/child relati=
onship.)"
 msgstr ""
 =

-#: association_mapping.xml:333(para) =

+#. Tag: programlisting
+#: association_mapping.xml:183
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <many-to-one name=3D\"address\" \n"
+      "        column=3D\"addressId\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"people\" inverse=3D\"true\">\n"
+      "        <key column=3D\"addressId\"/>\n"
+      "        <one-to-many class=3D\"Person\"/>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:187
+#, no-c-format
 msgid "If you use a <literal>List</literal> (or other indexed collection) =
you need to set the <literal>key</literal> column of the foreign key to <li=
teral>not null</literal>, and let Hibernate manage the association from the=
 collections side to maintain the index of each element (making the other s=
ide virtually inverse by setting <literal>update=3D\"false\"</literal> and =
<literal>insert=3D\"false\"</literal>):"
 msgstr ""
 =

-#: association_mapping.xml:361(para) =

+#. Tag: programlisting
+#: association_mapping.xml:195
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "   <id name=3D\"id\"/>\n"
+      "   ...\n"
+      "   <many-to-one name=3D\"address\"\n"
+      "      column=3D\"addressId\"\n"
+      "      not-null=3D\"true\"\n"
+      "      insert=3D\"false\"\n"
+      "      update=3D\"false\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "   <id name=3D\"id\"/>\n"
+      "   ...\n"
+      "   <list name=3D\"people\">\n"
+      "      <key column=3D\"addressId\" not-null=3D\"true\"/>\n"
+      "      <list-index column=3D\"peopleIdx\"/>\n"
+      "      <one-to-many class=3D\"Person\"/>\n"
+      "   </list>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:197
+#, no-c-format
 msgid "It is important that you define <literal>not-null=3D\"true\"</liter=
al> on the <literal>&lt;key&gt;</literal> element of the collection mapping=
 if the underlying foreign key column is <literal>NOT NULL</literal>. Don't=
 only declare <literal>not-null=3D\"true\"</literal> on a possible nested <=
literal>&lt;column&gt;</literal> element, but on the <literal>&lt;key&gt;</=
literal> element."
 msgstr ""
 =

-#: association_mapping.xml:375(para) =

+#. Tag: para
+#: association_mapping.xml:211
+#, no-c-format
 msgid "A <emphasis>bidirectional one-to-one association on a foreign key</=
emphasis> is quite common."
 msgstr ""
 =

-#: association_mapping.xml:402(para) =

+#. Tag: programlisting
+#: association_mapping.xml:216
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <many-to-one name=3D\"address\" \n"
+      "        column=3D\"addressId\" \n"
+      "        unique=3D\"true\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "   <one-to-one name=3D\"person\" \n"
+      "        property-ref=3D\"address\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:219
+#, no-c-format
 msgid "A <emphasis>bidirectional one-to-one association on a primary key</=
emphasis> uses the special id generator."
 msgstr ""
 =

-#: association_mapping.xml:433(title) =

+#. Tag: programlisting
+#: association_mapping.xml:224
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <one-to-one name=3D\"address\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"foreign\">\n"
+      "            <param name=3D\"property\">person</param>\n"
+      "        </generator>\n"
+      "    </id>\n"
+      "    <one-to-one name=3D\"person\" \n"
+      "        constrained=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:232
+#, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr ""
 =

-#: association_mapping.xml:438(para) =

+#. Tag: para
+#: association_mapping.xml:237
+#, no-c-format
 msgid "A <emphasis>bidirectional one-to-many association on a join table</=
emphasis>. Note that the <literal>inverse=3D\"true\"</literal> can go on ei=
ther end of the association, on the collection, or on the join."
 msgstr ""
 =

-#: association_mapping.xml:481(para) =

+#. Tag: programlisting
+#: association_mapping.xml:243
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"addresses\" \n"
+      "        table=3D\"PersonAddress\">\n"
+      "        <key column=3D\"personId\"/>\n"
+      "        <many-to-many column=3D\"addressId\"\n"
+      "            unique=3D\"true\"\n"
+      "            class=3D\"Address\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <join table=3D\"PersonAddress\" \n"
+      "        inverse=3D\"true\" \n"
+      "        optional=3D\"true\">\n"
+      "        <key column=3D\"addressId\"/>\n"
+      "        <many-to-one name=3D\"person\"\n"
+      "            column=3D\"personId\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "    </join>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: association_mapping.xml:244
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "create table Person ( personId bigint not null primary key )\n"
+      "create table PersonAddress ( personId bigint not null, addressId bi=
gint not null primary key )\n"
+      "create table Address ( addressId bigint not null primary key )\n"
+      "        ]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:251
+#, no-c-format
 msgid "A <emphasis>bidirectional one-to-one association on a join table</e=
mphasis> is extremely unusual, but possible."
 msgstr ""
 =

-#: association_mapping.xml:527(para) =

+#. Tag: programlisting
+#: association_mapping.xml:256
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <join table=3D\"PersonAddress\" \n"
+      "        optional=3D\"true\">\n"
+      "        <key column=3D\"personId\" \n"
+      "            unique=3D\"true\"/>\n"
+      "        <many-to-one name=3D\"address\"\n"
+      "            column=3D\"addressId\" \n"
+      "            not-null=3D\"true\"\n"
+      "            unique=3D\"true\"/>\n"
+      "    </join>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <join table=3D\"PersonAddress\" \n"
+      "        optional=3D\"true\"\n"
+      "        inverse=3D\"true\">\n"
+      "        <key column=3D\"addressId\" \n"
+      "            unique=3D\"true\"/>\n"
+      "        <many-to-one name=3D\"person\"\n"
+      "            column=3D\"personId\" \n"
+      "            not-null=3D\"true\"\n"
+      "            unique=3D\"true\"/>\n"
+      "    </join>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:264
+#, no-c-format
 msgid "Finally, we have a <emphasis>bidirectional many-to-many association=
</emphasis>."
 msgstr ""
 =

-#: association_mapping.xml:564(title) =

+#. Tag: programlisting
+#: association_mapping.xml:268
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\" column=3D\"personId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"addresses\" table=3D\"PersonAddress\">\n"
+      "        <key column=3D\"personId\"/>\n"
+      "        <many-to-many column=3D\"addressId\"\n"
+      "            class=3D\"Address\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "    <id name=3D\"id\" column=3D\"addressId\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <set name=3D\"people\" inverse=3D\"true\" table=3D\"PersonAddre=
ss\">\n"
+      "        <key column=3D\"addressId\"/>\n"
+      "        <many-to-many column=3D\"personId\"\n"
+      "            class=3D\"Person\"/>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: association_mapping.xml:277
+#, no-c-format
 msgid "More complex association mappings"
 msgstr ""
 =

-#: association_mapping.xml:566(para) =

+#. Tag: para
+#: association_mapping.xml:279
+#, no-c-format
 msgid "More complex association joins are <emphasis>extremely</emphasis> r=
are. Hibernate makes it possible to handle more complex situations using SQ=
L fragments embedded in the mapping document. For example, if a table with =
historical account information data defines <literal>accountNumber</literal=
>, <literal>effectiveEndDate</literal> and <literal>effectiveStartDate</lit=
eral>columns, mapped as follows:"
 msgstr ""
 =

-#: association_mapping.xml:584(para) =

+#. Tag: programlisting
+#: association_mapping.xml:288
+#, no-c-format
+msgid ""
+      "<![CDATA[<properties name=3D\"currentAccountKey\">\n"
+      "    <property name=3D\"accountNumber\" type=3D\"string\" not-null=
=3D\"true\"/>\n"
+      "    <property name=3D\"currentAccount\" type=3D\"boolean\">\n"
+      "        <formula>case when effectiveEndDate is null then 1 else 0 e=
nd</formula>\n"
+      "    </property>\n"
+      "</properties>\n"
+      "<property name=3D\"effectiveEndDate\" type=3D\"date\"/>\n"
+      "<property name=3D\"effectiveStateDate\" type=3D\"date\" not-null=3D=
\"true\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:290
+#, no-c-format
 msgid "Then we can map an association to the <emphasis>current</emphasis> =
instance (the one with null <literal>effectiveEndDate</literal>) using:"
 msgstr ""
 =

-#: association_mapping.xml:596(para) =

+#. Tag: programlisting
+#: association_mapping.xml:295
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one name=3D\"currentAccountInfo\" \n"
+      "        property-ref=3D\"currentAccountKey\"\n"
+      "        class=3D\"AccountInfo\">\n"
+      "    <column name=3D\"accountNumber\"/>\n"
+      "    <formula>'1'</formula>\n"
+      "</many-to-one>]]>"
+msgstr ""
+
+#. Tag: para
+#: association_mapping.xml:297
+#, no-c-format
 msgid "In a more complex example, imagine that the association between <li=
teral>Employee</literal> and <literal>Organization</literal> is maintained =
in an <literal>Employment</literal> table full of historical employment dat=
a. Then an association to the employee's <emphasis>most recent</emphasis> e=
mployer (the one with the most recent <literal>startDate</literal>) might b=
e mapped this way:"
 msgstr ""
 =

-#: association_mapping.xml:617(para) =

-msgid "You can get quite creative with this functionality, but it is usual=
ly more practical to handle these kinds of cases using HQL or a criteria qu=
ery."
+#. Tag: programlisting
+#: association_mapping.xml:305
+#, no-c-format
+msgid ""
+      "<![CDATA[<join>\n"
+      "    <key column=3D\"employeeId\"/>\n"
+      "    <subselect>\n"
+      "        select employeeId, orgId \n"
+      "        from Employments \n"
+      "        group by orgId \n"
+      "        having startDate =3D max(startDate)\n"
+      "    </subselect>\n"
+      "    <many-to-one name=3D\"mostRecentEmployer\" \n"
+      "            class=3D\"Organization\" \n"
+      "            column=3D\"orgId\"/>\n"
+      "</join>]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: association_mapping.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: association_mapping.xml:307
+#, no-c-format
+msgid "You can get quite creative with this functionality, but it is usual=
ly more practical to handle these kinds of cases using HQL or a criteria qu=
ery."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/basi=
c_mapping.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapp=
ing.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapp=
ing.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,1532 +1,3347 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:29-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: basic_mapping.xml:5(title) =

+#. Tag: title
+#: basic_mapping.xml:29
+#, no-c-format
 msgid "Basic O/R Mapping"
 msgstr ""
 =

-#: basic_mapping.xml:8(title) =

+#. Tag: title
+#: basic_mapping.xml:32
+#, no-c-format
 msgid "Mapping declaration"
 msgstr ""
 =

-#: basic_mapping.xml:10(para) =

+#. Tag: para
+#: basic_mapping.xml:34
+#, no-c-format
 msgid "Object/relational mappings are usually defined in an XML document. =
The mapping document is designed to be readable and hand-editable. The mapp=
ing language is Java-centric, meaning that mappings are constructed around =
persistent class declarations, not table declarations."
 msgstr ""
 =

-#: basic_mapping.xml:17(para) =

+#. Tag: para
+#: basic_mapping.xml:41
+#, no-c-format
 msgid "Note that, even though many Hibernate users choose to write the XML=
 by hand, a number of tools exist to generate the mapping document, includi=
ng XDoclet, Middlegen and AndroMDA."
 msgstr ""
 =

-#: basic_mapping.xml:23(para) =

+#. Tag: para
+#: basic_mapping.xml:47
+#, no-c-format
 msgid "Lets kick off with an example mapping:"
 msgstr ""
 =

-#: basic_mapping.xml:92(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:51
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "      \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
+      "          \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.=
dtd\">\n"
+      "\n"
+      "<hibernate-mapping package=3D\"eg\">\n"
+      "\n"
+      "        <class name=3D\"Cat\"\n"
+      "            table=3D\"cats\"\n"
+      "            discriminator-value=3D\"C\">\n"
+      "\n"
+      "                <id name=3D\"id\">\n"
+      "                        <generator class=3D\"native\"/>\n"
+      "                </id>\n"
+      "\n"
+      "                <discriminator column=3D\"subclass\"\n"
+      "                     type=3D\"character\"/>\n"
+      "\n"
+      "                <property name=3D\"weight\"/>\n"
+      "\n"
+      "                <property name=3D\"birthdate\"\n"
+      "                    type=3D\"date\"\n"
+      "                    not-null=3D\"true\"\n"
+      "                    update=3D\"false\"/>\n"
+      "\n"
+      "                <property name=3D\"color\"\n"
+      "                    type=3D\"eg.types.ColorUserType\"\n"
+      "                    not-null=3D\"true\"\n"
+      "                    update=3D\"false\"/>\n"
+      "\n"
+      "                <property name=3D\"sex\"\n"
+      "                    not-null=3D\"true\"\n"
+      "                    update=3D\"false\"/>\n"
+      "\n"
+      "                <property name=3D\"litterId\"\n"
+      "                    column=3D\"litterId\"\n"
+      "                    update=3D\"false\"/>\n"
+      "\n"
+      "                <many-to-one name=3D\"mother\"\n"
+      "                    column=3D\"mother_id\"\n"
+      "                    update=3D\"false\"/>\n"
+      "\n"
+      "                <set name=3D\"kittens\"\n"
+      "                    inverse=3D\"true\"\n"
+      "                    order-by=3D\"litter_id\">\n"
+      "                        <key column=3D\"mother_id\"/>\n"
+      "                        <one-to-many class=3D\"Cat\"/>\n"
+      "                </set>\n"
+      "\n"
+      "                <subclass name=3D\"DomesticCat\"\n"
+      "                    discriminator-value=3D\"D\">\n"
+      "\n"
+      "                        <property name=3D\"name\"\n"
+      "                            type=3D\"string\"/>\n"
+      "\n"
+      "                </subclass>\n"
+      "\n"
+      "        </class>\n"
+      "\n"
+      "        <class name=3D\"Dog\">\n"
+      "                <!-- mapping for Dog could go here -->\n"
+      "        </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:53
+#, no-c-format
 msgid "We will now discuss the content of the mapping document. We will on=
ly describe the document elements and attributes that are used by Hibernate=
 at runtime. The mapping document also contains some extra optional attribu=
tes and elements that affect the database schemas exported by the schema ex=
port tool. (For example the <literal> not-null</literal> attribute.)"
 msgstr ""
 =

-#: basic_mapping.xml:103(title) =

+#. Tag: title
+#: basic_mapping.xml:64
+#, no-c-format
 msgid "Doctype"
 msgstr ""
 =

-#: basic_mapping.xml:105(para) =

+#. Tag: para
+#: basic_mapping.xml:66
+#, no-c-format
 msgid "All XML mappings should declare the doctype shown. The actual DTD m=
ay be found at the URL above, in the directory <literal>hibernate-x.x.x/src=
/org/hibernate </literal> or in <literal>hibernate3.jar</literal>. Hibernat=
e will always look for the DTD in its classpath first. If you experience lo=
okups of the DTD using an Internet connection, check your DTD declaration a=
gainst the contents of your claspath."
 msgstr ""
 =

-#: basic_mapping.xml:115(title) =

+#. Tag: title
+#: basic_mapping.xml:76
+#, no-c-format
 msgid "EntityResolver"
 msgstr ""
 =

-#: basic_mapping.xml:116(para) =

+#. Tag: para
+#: basic_mapping.xml:77
+#, no-c-format
 msgid "As mentioned previously, Hibernate will first attempt to resolve DT=
Ds in its classpath. The manner in which it does this is by registering a c=
ustom <literal>org.xml.sax.EntityResolver</literal> implementation with the=
 SAXReader it uses to read in the xml files. This custom <literal>EntityRes=
olver</literal> recognizes two different systemId namespaces."
 msgstr ""
 =

-#: basic_mapping.xml:124(para) =

+#. Tag: para
+#: basic_mapping.xml:85
+#, no-c-format
 msgid "a <literal>hibernate namespace</literal> is recognized whenever the=
 resolver encounteres a systemId starting with <literal>http://hibernate.so=
urceforge.net/</literal>; the resolver attempts to resolve these entities v=
ia the classlaoder which loaded the Hibernate classes."
 msgstr ""
 =

-#: basic_mapping.xml:133(para) =

+#. Tag: para
+#: basic_mapping.xml:94
+#, no-c-format
 msgid "a <literal>user namespace</literal> is recognized whenever the reso=
lver encounteres a systemId using a <literal>classpath://</literal> URL pro=
tocol; the resolver will attempt to resolve these entities via (1) the curr=
ent thread context classloader and (2) the classloader which loaded the Hib=
ernate classes."
 msgstr ""
 =

-#: basic_mapping.xml:142(para) =

+#. Tag: para
+#: basic_mapping.xml:103
+#, no-c-format
 msgid "An example of utilizing user namespacing:"
 msgstr ""
 =

-#: basic_mapping.xml:160(para) =

-msgid "Where <literal>types.xml</literal> is a resource in the <literal>yo=
ur.domain</literal> package and contains a custom <xref linkend=3D\"mapping=
-types-custom\">typedef</xref>."
+#. Tag: programlisting
+#: basic_mapping.xml:106
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
+      "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dt=
d\" [\n"
+      "    <!ENTITY types SYSTEM \"classpath://your/domain/types.xml\">\n"
+      "]>\n"
+      "\n"
+      "<hibernate-mapping package=3D\"your.domain\">\n"
+      "    <class name=3D\"MyEntity\">\n"
+      "        <id name=3D\"id\" type=3D\"my-custom-id-type\">\n"
+      "            ...\n"
+      "        </id>\n"
+      "    <class>\n"
+      "    &types;\n"
+      "</hibernate-mapping>]]>"
 msgstr ""
 =

-#: basic_mapping.xml:168(title) =

+#. Tag: para
+#: basic_mapping.xml:107
+#, no-c-format
+msgid "Where <literal>types.xml</literal> is a resource in the <literal>yo=
ur.domain</literal> package and contains a custom <link linkend=3D\"mapping=
-types-custom\">typedef</link>."
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:115
+#, no-c-format
 msgid "hibernate-mapping"
 msgstr ""
 =

-#: basic_mapping.xml:170(para) =

+#. Tag: para
+#: basic_mapping.xml:117
+#, no-c-format
 msgid "This element has several optional attributes. The <literal>schema</=
literal> and <literal>catalog</literal> attributes specify that tables refe=
rred to in this mapping belong to the named schema and/or catalog. If speci=
fied, tablenames will be qualified by the given schema and catalog names. I=
f missing, tablenames will be unqualified. The <literal>default-cascade</li=
teral> attribute specifies what cascade style should be assumed for propert=
ies and collections which do not specify a <literal>cascade</literal> attri=
bute. The <literal>auto-import</literal> attribute lets us use unqualified =
class names in the query language, by default."
 msgstr ""
 =

-#: basic_mapping.xml:202(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:138
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping\n"
+      "         schema=3D\"schemaName\"\n"
+      "         catalog=3D\"catalogName\"\n"
+      "         default-cascade=3D\"cascade_style\"\n"
+      "         default-access=3D\"field|property|ClassName\"\n"
+      "         default-lazy=3D\"true|false\"\n"
+      "         auto-import=3D\"true|false\"\n"
+      "         package=3D\"package.name\"\n"
+      " />]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:141
+#, no-c-format
 msgid "<literal>schema</literal> (optional): The name of a database schema=
."
 msgstr ""
 =

-#: basic_mapping.xml:207(para) =

+#. Tag: para
+#: basic_mapping.xml:146
+#, no-c-format
 msgid "<literal>catalog</literal> (optional): The name of a database catal=
og."
 msgstr ""
 =

-#: basic_mapping.xml:212(para) =

+#. Tag: para
+#: basic_mapping.xml:151
+#, no-c-format
 msgid "<literal>default-cascade</literal> (optional - defaults to <literal=
>none</literal>): A default cascade style."
 msgstr ""
 =

-#: basic_mapping.xml:218(para) =

+#. Tag: para
+#: basic_mapping.xml:157
+#, no-c-format
 msgid "<literal>default-access</literal> (optional - defaults to <literal>=
property</literal>): The strategy Hibernate should use for accessing all pr=
operties. Can be a custom implementation of <literal>PropertyAccessor</lite=
ral>."
 msgstr ""
 =

-#: basic_mapping.xml:225(para) =

+#. Tag: para
+#: basic_mapping.xml:164
+#, no-c-format
 msgid "<literal>default-lazy</literal> (optional - defaults to <literal>tr=
ue</literal>): The default value for unspecifed <literal>lazy</literal> att=
ributes of class and collection mappings."
 msgstr ""
 =

-#: basic_mapping.xml:232(para) =

+#. Tag: para
+#: basic_mapping.xml:171
+#, no-c-format
 msgid "<literal>auto-import</literal> (optional - defaults to <literal>tru=
e</literal>): Specifies whether we can use unqualified class names (of clas=
ses in this mapping) in the query language."
 msgstr ""
 =

-#: basic_mapping.xml:239(para) =

+#. Tag: para
+#: basic_mapping.xml:178
+#, no-c-format
 msgid "<literal>package</literal> (optional): Specifies a package prefix t=
o assume for unqualified class names in the mapping document."
 msgstr ""
 =

-#: basic_mapping.xml:247(para) =

+#. Tag: para
+#: basic_mapping.xml:186
+#, no-c-format
 msgid "If you have two persistent classes with the same (unqualified) name=
, you should set <literal>auto-import=3D\"false\"</literal>. Hibernate will=
 throw an exception if you attempt to assign two classes to the same \"impo=
rted\" name."
 msgstr ""
 =

-#: basic_mapping.xml:253(para) =

+#. Tag: para
+#: basic_mapping.xml:192
+#, no-c-format
 msgid "Note that the <literal>hibernate-mapping</literal> element allows y=
ou to nest several persistent <literal>&lt;class&gt;</literal> mappings, as=
 shown above. It is however good practice (and expected by some tools) to m=
ap only a single persistent class (or a single class hierarchy) in one mapp=
ing file and name it after the persistent superclass, e.g. <literal>Cat.hbm=
.xml</literal>, <literal>Dog.hbm.xml</literal>, or if using inheritance, <l=
iteral>Animal.hbm.xml</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:266(title) basic_mapping.xml:3077(literal) =

-msgid "class"
+#. Tag: title
+#: basic_mapping.xml:205
+#, no-c-format
+msgid "<title>class</title>"
 msgstr ""
 =

-#: basic_mapping.xml:268(para) =

+#. Tag: para
+#: basic_mapping.xml:207
+#, no-c-format
 msgid "You may declare a persistent class using the <literal>class</litera=
l> element:"
 msgstr ""
 =

-#: basic_mapping.xml:322(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:235
+#, no-c-format
+msgid ""
+      "<![CDATA[<class\n"
+      "        name=3D\"ClassName\"\n"
+      "        table=3D\"tableName\"\n"
+      "        discriminator-value=3D\"discriminator_value\"\n"
+      "        mutable=3D\"true|false\"\n"
+      "        schema=3D\"owner\"\n"
+      "        catalog=3D\"catalog\"\n"
+      "        proxy=3D\"ProxyInterface\"\n"
+      "        dynamic-update=3D\"true|false\"\n"
+      "        dynamic-insert=3D\"true|false\"\n"
+      "        select-before-update=3D\"true|false\"\n"
+      "        polymorphism=3D\"implicit|explicit\"\n"
+      "        where=3D\"arbitrary sql where condition\"\n"
+      "        persister=3D\"PersisterClass\"\n"
+      "        batch-size=3D\"N\"\n"
+      "        optimistic-lock=3D\"none|version|dirty|all\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        check=3D\"arbitrary sql check condition\"\n"
+      "        rowid=3D\"rowid\"\n"
+      "        subselect=3D\"SQL expression\"\n"
+      "        abstract=3D\"true|false\"\n"
+      "        node=3D\"element-name\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:238
+#, no-c-format
 msgid "<literal>name</literal> (optional): The fully qualified Java class =
name of the persistent class (or interface). If this attribute is missing, =
it is assumed that the mapping is for a non-POJO entity."
 msgstr ""
 =

-#: basic_mapping.xml:329(para) =

+#. Tag: para
+#: basic_mapping.xml:245
+#, no-c-format
 msgid "<literal>table</literal> (optional - defaults to the unqualified cl=
ass name): The name of its database table."
 msgstr ""
 =

-#: basic_mapping.xml:335(para) =

+#. Tag: para
+#: basic_mapping.xml:251
+#, no-c-format
 msgid "<literal>discriminator-value</literal> (optional - defaults to the =
class name): A value that distiguishes individual subclasses, used for poly=
morphic behaviour. Acceptable values include <literal>null</literal> and <l=
iteral>not null</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:342(para) =

+#. Tag: para
+#: basic_mapping.xml:258
+#, no-c-format
 msgid "<literal>mutable</literal> (optional, defaults to <literal>true</li=
teral>): Specifies that instances of the class are (not) mutable."
 msgstr ""
 =

-#: basic_mapping.xml:348(para) basic_mapping.xml:2605(para) =

+#. Tag: para
+#: basic_mapping.xml:264 basic_mapping.xml:2228
+#, no-c-format
 msgid "<literal>schema</literal> (optional): Override the schema name spec=
ified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 =

-#: basic_mapping.xml:354(para) basic_mapping.xml:2611(para) =

+#. Tag: para
+#: basic_mapping.xml:270 basic_mapping.xml:2234
+#, no-c-format
 msgid "<literal>catalog</literal> (optional): Override the catalog name sp=
ecified by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 =

-#: basic_mapping.xml:360(para) =

+#. Tag: para
+#: basic_mapping.xml:276
+#, no-c-format
 msgid "<literal>proxy</literal> (optional): Specifies an interface to use =
for lazy initializing proxies. You may specify the name of the class itself=
."
 msgstr ""
 =

-#: basic_mapping.xml:366(para) =

+#. Tag: para
+#: basic_mapping.xml:282
+#, no-c-format
 msgid "<literal>dynamic-update</literal> (optional, defaults to <literal>f=
alse</literal>): Specifies that <literal>UPDATE</literal> SQL should be gen=
erated at runtime and contain only those columns whose values have changed."
 msgstr ""
 =

-#: basic_mapping.xml:373(para) =

+#. Tag: para
+#: basic_mapping.xml:289
+#, no-c-format
 msgid "<literal>dynamic-insert</literal> (optional, defaults to <literal>f=
alse</literal>): Specifies that <literal>INSERT</literal> SQL should be gen=
erated at runtime and contain only the columns whose values are not null."
 msgstr ""
 =

-#: basic_mapping.xml:380(para) =

+#. Tag: para
+#: basic_mapping.xml:296
+#, no-c-format
 msgid "<literal>select-before-update</literal> (optional, defaults to <lit=
eral>false</literal>): Specifies that Hibernate should <emphasis>never</emp=
hasis> perform an SQL <literal>UPDATE</literal> unless it is certain that a=
n object is actually modified. In certain cases (actually, only when a tran=
sient object has been associated with a new session using <literal>update()=
</literal>), this means that Hibernate will perform an extra SQL <literal>S=
ELECT</literal> to determine if an <literal>UPDATE</literal> is actually re=
quired."
 msgstr ""
 =

-#: basic_mapping.xml:390(para) =

+#. Tag: para
+#: basic_mapping.xml:306
+#, no-c-format
 msgid "<literal>polymorphism</literal> (optional, defaults to <literal>imp=
licit</literal>): Determines whether implicit or explicit query polymorphis=
m is used."
 msgstr ""
 =

-#: basic_mapping.xml:396(para) =

+#. Tag: para
+#: basic_mapping.xml:312
+#, no-c-format
 msgid "<literal>where</literal> (optional) specify an arbitrary SQL <liter=
al>WHERE</literal> condition to be used when retrieving objects of this cla=
ss"
 msgstr ""
 =

-#: basic_mapping.xml:402(para) =

+#. Tag: para
+#: basic_mapping.xml:318
+#, no-c-format
 msgid "<literal>persister</literal> (optional): Specifies a custom <litera=
l>ClassPersister</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:407(para) =

+#. Tag: para
+#: basic_mapping.xml:323
+#, no-c-format
 msgid "<literal>batch-size</literal> (optional, defaults to <literal>1</li=
teral>) specify a \"batch size\" for fetching instances of this class by id=
entifier."
 msgstr ""
 =

-#: basic_mapping.xml:413(para) =

+#. Tag: para
+#: basic_mapping.xml:329
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional, defaults to <literal>=
version</literal>): Determines the optimistic locking strategy."
 msgstr ""
 =

-#: basic_mapping.xml:419(para) =

+#. Tag: para
+#: basic_mapping.xml:335
+#, no-c-format
 msgid "<literal>lazy</literal> (optional): Lazy fetching may be completely=
 disabled by setting <literal>lazy=3D\"false\"</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:425(para) =

+#. Tag: para
+#: basic_mapping.xml:341
+#, no-c-format
 msgid "<literal>entity-name</literal> (optional, defaults to the class nam=
e): Hibernate3 allows a class to be mapped multiple times (to different tab=
les, potentially), and allows entity mappings that are represented by Maps =
or XML at the Java level. In these cases, you should provide an explicit ar=
bitrary name for the entity. See <xref linkend=3D\"persistent-classes-dynam=
icmodels\"/> and <xref linkend=3D\"xml\"/> for more information."
 msgstr ""
 =

-#: basic_mapping.xml:435(para) =

+#. Tag: para
+#: basic_mapping.xml:351
+#, no-c-format
 msgid "<literal>check</literal> (optional): A SQL expression used to gener=
ate a multi-row <emphasis>check</emphasis> constraint for automatic schema =
generation."
 msgstr ""
 =

-#: basic_mapping.xml:441(para) =

+#. Tag: para
+#: basic_mapping.xml:357
+#, no-c-format
 msgid "<literal>rowid</literal> (optional): Hibernate can use so called RO=
WIDs on databases which support. E.g. on Oracle, Hibernate can use the <lit=
eral>rowid</literal> extra column for fast updates if you set this option t=
o <literal>rowid</literal>. A ROWID is an implementation detail and represe=
nts the physical location of a stored tuple."
 msgstr ""
 =

-#: basic_mapping.xml:449(para) =

+#. Tag: para
+#: basic_mapping.xml:365
+#, no-c-format
 msgid "<literal>subselect</literal> (optional): Maps an immutable and read=
-only entity to a database subselect. Useful if you want to have a view ins=
tead of a base table, but don't. See below for more information."
 msgstr ""
 =

-#: basic_mapping.xml:456(para) =

+#. Tag: para
+#: basic_mapping.xml:372
+#, no-c-format
 msgid "<literal>abstract</literal> (optional): Used to mark abstract super=
classes in <literal>&lt;union-subclass&gt;</literal> hierarchies."
 msgstr ""
 =

-#: basic_mapping.xml:464(para) =

+#. Tag: para
+#: basic_mapping.xml:380
+#, no-c-format
 msgid "It is perfectly acceptable for the named persistent class to be an =
interface. You would then declare implementing classes of that interface us=
ing the <literal>&lt;subclass&gt;</literal> element. You may persist any <e=
mphasis>static</emphasis> inner class. You should specify the class name us=
ing the standard form ie. <literal>eg.Foo$Bar</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:471(para) =

+#. Tag: para
+#: basic_mapping.xml:387
+#, no-c-format
 msgid "Immutable classes, <literal>mutable=3D\"false\"</literal>, may not =
be updated or deleted by the application. This allows Hibernate to make som=
e minor performance optimizations."
 msgstr ""
 =

-#: basic_mapping.xml:476(para) =

+#. Tag: para
+#: basic_mapping.xml:392
+#, no-c-format
 msgid "The optional <literal>proxy</literal> attribute enables lazy initia=
lization of persistent instances of the class. Hibernate will initially ret=
urn CGLIB proxies which implement the named interface. The actual persisten=
t object will be loaded when a method of the proxy is invoked. See \"Initia=
lizing collections and proxies\" below."
 msgstr ""
 =

-#: basic_mapping.xml:483(para) =

+#. Tag: para
+#: basic_mapping.xml:399
+#, no-c-format
 msgid "<emphasis>Implicit</emphasis> polymorphism means that instances of =
the class will be returned by a query that names any superclass or implemen=
ted interface or the class and that instances of any subclass of the class =
will be returned by a query that names the class itself. <emphasis>Explicit=
</emphasis> polymorphism means that class instances will be returned only b=
y queries that explicitly name that class and that queries that name the cl=
ass will return only instances of subclasses mapped inside this <literal>&l=
t;class&gt;</literal> declaration as a <literal>&lt;subclass&gt;</literal> =
or <literal>&lt;joined-subclass&gt;</literal>. For most purposes the defaul=
t, <literal>polymorphism=3D\"implicit\"</literal>, is appropriate. Explicit=
 polymorphism is useful when two different classes are mapped to the same t=
able (this allows a \"lightweight\" class that contains a subset of the tab=
le columns)."
 msgstr ""
 =

-#: basic_mapping.xml:495(para) =

+#. Tag: para
+#: basic_mapping.xml:411
+#, no-c-format
 msgid "The <literal>persister</literal> attribute lets you customize the p=
ersistence strategy used for the class. You may, for example, specify your =
own subclass of <literal>org.hibernate.persister.EntityPersister</literal> =
or you might even provide a completely new implementation of the interface =
<literal>org.hibernate.persister.ClassPersister</literal> that implements p=
ersistence via, for example, stored procedure calls, serialization to flat =
files or LDAP. See <literal>org.hibernate.test.CustomPersister</literal> fo=
r a simple example (of \"persistence\" to a <literal>Hashtable</literal>)."
 msgstr ""
 =

-#: basic_mapping.xml:506(para) =

+#. Tag: para
+#: basic_mapping.xml:422
+#, no-c-format
 msgid "Note that the <literal>dynamic-update</literal> and <literal>dynami=
c-insert</literal> settings are not inherited by subclasses and so may also=
 be specified on the <literal>&lt;subclass&gt;</literal> or <literal>&lt;jo=
ined-subclass&gt;</literal> elements. These settings may increase performan=
ce in some cases, but might actually decrease performance in others. Use ju=
diciously."
 msgstr ""
 =

-#: basic_mapping.xml:514(para) =

+#. Tag: para
+#: basic_mapping.xml:430
+#, no-c-format
 msgid "Use of <literal>select-before-update</literal> will usually decreas=
e performance. It is very useful to prevent a database update trigger being=
 called unnecessarily if you reattach a graph of detached instances to a <l=
iteral>Session</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:520(para) =

+#. Tag: para
+#: basic_mapping.xml:436
+#, no-c-format
 msgid "If you enable <literal>dynamic-update</literal>, you will have a ch=
oice of optimistic locking strategies:"
 msgstr ""
 =

-#: basic_mapping.xml:526(para) =

+#. Tag: para
+#: basic_mapping.xml:442
+#, no-c-format
 msgid "<literal>version</literal> check the version/timestamp columns"
 msgstr ""
 =

-#: basic_mapping.xml:531(para) =

+#. Tag: para
+#: basic_mapping.xml:447
+#, no-c-format
 msgid "<literal>all</literal> check all columns"
 msgstr ""
 =

-#: basic_mapping.xml:536(para) =

+#. Tag: para
+#: basic_mapping.xml:452
+#, no-c-format
 msgid "<literal>dirty</literal> check the changed columns, allowing some c=
oncurrent updates"
 msgstr ""
 =

-#: basic_mapping.xml:541(para) =

+#. Tag: para
+#: basic_mapping.xml:457
+#, no-c-format
 msgid "<literal>none</literal> do not use optimistic locking"
 msgstr ""
 =

-#: basic_mapping.xml:546(para) =

+#. Tag: para
+#: basic_mapping.xml:462
+#, no-c-format
 msgid "We <emphasis>very</emphasis> strongly recommend that you use versio=
n/timestamp columns for optimistic locking with Hibernate. This is the opti=
mal strategy with respect to performance and is the only strategy that corr=
ectly handles modifications made to detached instances (ie. when <literal>S=
ession.merge()</literal> is used)."
 msgstr ""
 =

-#: basic_mapping.xml:553(para) =

+#. Tag: para
+#: basic_mapping.xml:469
+#, no-c-format
 msgid "There is no difference between a view and a base table for a Hibern=
ate mapping, as expected this is transparent at the database level (note th=
at some DBMS don't support views properly, especially with updates). Someti=
mes you want to use a view, but can't create one in the database (ie. with =
a legacy schema). In this case, you can map an immutable and read-only enti=
ty to a given SQL subselect expression:"
 msgstr ""
 =

-#: basic_mapping.xml:574(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:477
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Summary\">\n"
+      "    <subselect>\n"
+      "        select item.name, max(bid.amount), count(*)\n"
+      "        from item\n"
+      "        join bid on bid.item_id =3D item.id\n"
+      "        group by item.name\n"
+      "    </subselect>\n"
+      "    <synchronize table=3D\"item\"/>\n"
+      "    <synchronize table=3D\"bid\"/>\n"
+      "    <id name=3D\"name\"/>\n"
+      "    ...\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:479
+#, no-c-format
 msgid "Declare the tables to synchronize this entity with, ensuring that a=
uto-flush happens correctly, and that queries against the derived entity do=
 not return stale data. The <literal>&lt;subselect&gt;</literal> is availab=
le as both as an attribute and a nested mapping element."
 msgstr ""
 =

-#: basic_mapping.xml:584(title) =

-msgid "id"
+#. Tag: title
+#: basic_mapping.xml:489
+#, no-c-format
+msgid "<title>id</title>"
 msgstr ""
 =

-#: basic_mapping.xml:586(para) =

+#. Tag: para
+#: basic_mapping.xml:491
+#, no-c-format
 msgid "Mapped classes <emphasis>must</emphasis> declare the primary key co=
lumn of the database table. Most classes will also have a JavaBeans-style p=
roperty holding the unique identifier of an instance. The <literal>&lt;id&g=
t;</literal> element defines the mapping from that property to the primary =
key column."
 msgstr ""
 =

-#: basic_mapping.xml:613(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:506
+#, no-c-format
+msgid ""
+      "<![CDATA[<id\n"
+      "        name=3D\"propertyName\"\n"
+      "        type=3D\"typename\"\n"
+      "        column=3D\"column_name\"\n"
+      "        unsaved-value=3D\"null|any|none|undefined|id_value\"\n"
+      "        access=3D\"field|property|ClassName\">\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "\n"
+      "        <generator class=3D\"generatorClass\"/>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:509
+#, no-c-format
 msgid "<literal>name</literal> (optional): The name of the identifier prop=
erty."
 msgstr ""
 =

-#: basic_mapping.xml:618(para) =

+#. Tag: para
+#: basic_mapping.xml:514
+#, no-c-format
 msgid "<literal>type</literal> (optional): A name that indicates the Hiber=
nate type."
 msgstr ""
 =

-#: basic_mapping.xml:623(para) =

+#. Tag: para
+#: basic_mapping.xml:519
+#, no-c-format
 msgid "<literal>column</literal> (optional - defaults to the property name=
): The name of the primary key column."
 msgstr ""
 =

-#: basic_mapping.xml:629(para) =

+#. Tag: para
+#: basic_mapping.xml:525
+#, no-c-format
 msgid "<literal>unsaved-value</literal> (optional - defaults to a \"sensib=
le\" value): An identifier property value that indicates that an instance i=
s newly instantiated (unsaved), distinguishing it from detached instances t=
hat were saved or loaded in a previous session."
 msgstr ""
 =

-#: basic_mapping.xml:637(para) basic_mapping.xml:1187(para) basic_mapping.=
xml:1343(para) basic_mapping.xml:1433(para) basic_mapping.xml:1559(para) ba=
sic_mapping.xml:1775(para) basic_mapping.xml:1963(para) basic_mapping.xml:2=
162(para) basic_mapping.xml:2914(para) =

+#. Tag: para
+#: basic_mapping.xml:533 basic_mapping.xml:1041 basic_mapping.xml:1180 bas=
ic_mapping.xml:1262 basic_mapping.xml:1369 basic_mapping.xml:1558 basic_map=
ping.xml:1732 basic_mapping.xml:1902 basic_mapping.xml:2481
+#, no-c-format
 msgid "<literal>access</literal> (optional - defaults to <literal>property=
</literal>): The strategy Hibernate should use for accessing the property v=
alue."
 msgstr ""
 =

-#: basic_mapping.xml:645(para) =

+#. Tag: para
+#: basic_mapping.xml:541
+#, no-c-format
 msgid "If the <literal>name</literal> attribute is missing, it is assumed =
that the class has no identifier property."
 msgstr ""
 =

-#: basic_mapping.xml:650(para) =

+#. Tag: para
+#: basic_mapping.xml:546
+#, no-c-format
 msgid "The <literal>unsaved-value</literal> attribute is almost never need=
ed in Hibernate3."
 msgstr ""
 =

-#: basic_mapping.xml:654(para) =

+#. Tag: para
+#: basic_mapping.xml:550
+#, no-c-format
 msgid "There is an alternative <literal>&lt;composite-id&gt;</literal> dec=
laration to allow access to legacy data with composite keys. We strongly di=
scourage its use for anything else."
 msgstr ""
 =

-#: basic_mapping.xml:660(title) =

+#. Tag: title
+#: basic_mapping.xml:556
+#, no-c-format
 msgid "Generator"
 msgstr ""
 =

-#: basic_mapping.xml:662(para) =

+#. Tag: para
+#: basic_mapping.xml:558
+#, no-c-format
 msgid "The optional <literal>&lt;generator&gt;</literal> child element nam=
es a Java class used to generate unique identifiers for instances of the pe=
rsistent class. If any parameters are required to configure or initialize t=
he generator instance, they are passed using the <literal>&lt;param&gt;</li=
teral> element."
 msgstr ""
 =

-#: basic_mapping.xml:684(literal) =

+#. Tag: programlisting
+#: basic_mapping.xml:565
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"cat_id\">\n"
+      "        <generator class=3D\"org.hibernate.id.TableHiLoGenerator\">=
\n"
+      "                <param name=3D\"table\">uid_table</param>\n"
+      "                <param name=3D\"column\">next_hi_value_column</para=
m>\n"
+      "        </generator>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:567
+#, no-c-format
+msgid "All generators implement the interface <literal>org.hibernate.id.Id=
entifierGenerator</literal>. This is a very simple interface; some applicat=
ions may choose to provide their own specialized implementations. However, =
Hibernate provides a range of built-in implementations. There are shortcut =
names for the built-in generators:"
+msgstr ""
+
+#. Tag: literal
+#: basic_mapping.xml:575
+#, no-c-format
 msgid "increment"
 msgstr ""
 =

-#: basic_mapping.xml:686(para) =

+#. Tag: para
+#: basic_mapping.xml:577
+#, no-c-format
 msgid "generates identifiers of type <literal>long</literal>, <literal>sho=
rt</literal> or <literal>int</literal> that are unique only when no other p=
rocess is inserting data into the same table. <emphasis>Do not use in a clu=
ster.</emphasis>"
 msgstr ""
 =

-#: basic_mapping.xml:695(literal) =

+#. Tag: literal
+#: basic_mapping.xml:586
+#, no-c-format
 msgid "identity"
 msgstr ""
 =

-#: basic_mapping.xml:697(para) =

+#. Tag: para
+#: basic_mapping.xml:588
+#, no-c-format
 msgid "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and =
HypersonicSQL. The returned identifier is of type <literal>long</literal>, =
<literal>short</literal> or <literal>int</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:705(literal) =

+#. Tag: literal
+#: basic_mapping.xml:596
+#, no-c-format
 msgid "sequence"
 msgstr ""
 =

-#: basic_mapping.xml:707(para) =

+#. Tag: para
+#: basic_mapping.xml:598
+#, no-c-format
 msgid "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a gene=
rator in Interbase. The returned identifier is of type <literal>long</liter=
al>, <literal>short</literal> or <literal>int</literal>"
 msgstr ""
 =

-#: basic_mapping.xml:715(literal) =

+#. Tag: literal
+#: basic_mapping.xml:606
+#, no-c-format
 msgid "hilo"
 msgstr ""
 =

-#: basic_mapping.xml:717(para) =

+#. Tag: para
+#: basic_mapping.xml:608
+#, no-c-format
 msgid "uses a hi/lo algorithm to efficiently generate identifiers of type =
<literal>long</literal>, <literal>short</literal> or <literal>int</literal>=
, given a table and column (by default <literal>hibernate_unique_key</liter=
al> and <literal>next_hi</literal> respectively) as a source of hi values. =
The hi/lo algorithm generates identifiers that are unique only for a partic=
ular database."
 msgstr ""
 =

-#: basic_mapping.xml:727(literal) =

+#. Tag: literal
+#: basic_mapping.xml:618
+#, no-c-format
 msgid "seqhilo"
 msgstr ""
 =

-#: basic_mapping.xml:729(para) =

+#. Tag: para
+#: basic_mapping.xml:620
+#, no-c-format
 msgid "uses a hi/lo algorithm to efficiently generate identifiers of type =
<literal>long</literal>, <literal>short</literal> or <literal>int</literal>=
, given a named database sequence."
 msgstr ""
 =

-#: basic_mapping.xml:737(literal) =

+#. Tag: literal
+#: basic_mapping.xml:628
+#, no-c-format
 msgid "uuid"
 msgstr ""
 =

-#: basic_mapping.xml:739(para) =

+#. Tag: para
+#: basic_mapping.xml:630
+#, no-c-format
 msgid "uses a 128-bit UUID algorithm to generate identifiers of type strin=
g, unique within a network (the IP address is used). The UUID is encoded as=
 a string of hexadecimal digits of length 32."
 msgstr ""
 =

-#: basic_mapping.xml:747(literal) =

+#. Tag: literal
+#: basic_mapping.xml:638
+#, no-c-format
 msgid "guid"
 msgstr ""
 =

-#: basic_mapping.xml:749(para) =

+#. Tag: para
+#: basic_mapping.xml:640
+#, no-c-format
 msgid "uses a database-generated GUID string on MS SQL Server and MySQL."
 msgstr ""
 =

-#: basic_mapping.xml:755(literal) =

+#. Tag: literal
+#: basic_mapping.xml:646
+#, no-c-format
 msgid "native"
 msgstr ""
 =

-#: basic_mapping.xml:757(para) =

+#. Tag: para
+#: basic_mapping.xml:648
+#, no-c-format
 msgid "picks <literal>identity</literal>, <literal>sequence</literal> or <=
literal>hilo</literal> depending upon the capabilities of the underlying da=
tabase."
 msgstr ""
 =

-#: basic_mapping.xml:765(literal) =

+#. Tag: literal
+#: basic_mapping.xml:656
+#, no-c-format
 msgid "assigned"
 msgstr ""
 =

-#: basic_mapping.xml:767(para) =

+#. Tag: para
+#: basic_mapping.xml:658
+#, no-c-format
 msgid "lets the application to assign an identifier to the object before <=
literal>save()</literal> is called. This is the default strategy if no <lit=
eral>&lt;generator&gt;</literal> element is specified."
 msgstr ""
 =

-#: basic_mapping.xml:775(literal) =

+#. Tag: literal
+#: basic_mapping.xml:666
+#, no-c-format
 msgid "select"
 msgstr ""
 =

-#: basic_mapping.xml:777(para) =

+#. Tag: para
+#: basic_mapping.xml:668
+#, no-c-format
 msgid "retrieves a primary key assigned by a database trigger by selecting=
 the row by some unique key and retrieving the primary key value."
 msgstr ""
 =

-#: basic_mapping.xml:784(literal) =

+#. Tag: literal
+#: basic_mapping.xml:675
+#, no-c-format
 msgid "foreign"
 msgstr ""
 =

-#: basic_mapping.xml:786(para) =

+#. Tag: para
+#: basic_mapping.xml:677
+#, no-c-format
 msgid "uses the identifier of another associated object. Usually used in c=
onjunction with a <literal>&lt;one-to-one&gt;</literal> primary key associa=
tion."
 msgstr ""
 =

-#: basic_mapping.xml:793(literal) =

+#. Tag: literal
+#: basic_mapping.xml:684
+#, no-c-format
 msgid "sequence-identity"
 msgstr ""
 =

-#: basic_mapping.xml:795(para) =

+#. Tag: para
+#: basic_mapping.xml:686
+#, no-c-format
 msgid "a specialized sequence generation strategy which utilizes a databas=
e sequence for the actual value generation, but combines this with JDBC3 ge=
tGeneratedKeys to actually return the generated identifier value as part of=
 the insert statement execution. This strategy is only known to be supporte=
d on Oracle 10g drivers targetted for JDK 1.4. Note comments on these inser=
t statements are disabled due to a bug in the Oracle drivers."
 msgstr ""
 =

-#: basic_mapping.xml:676(para) =

-msgid "All generators implement the interface <literal>org.hibernate.id.Id=
entifierGenerator</literal>. This is a very simple interface; some applicat=
ions may choose to provide their own specialized implementations. However, =
Hibernate provides a range of built-in implementations. There are shortcut =
names for the built-in generators: <placeholder-1/>"
-msgstr ""
-
-#: basic_mapping.xml:812(title) =

+#. Tag: title
+#: basic_mapping.xml:703
+#, no-c-format
 msgid "Hi/lo algorithm"
 msgstr ""
 =

-#: basic_mapping.xml:813(para) =

+#. Tag: para
+#: basic_mapping.xml:704
+#, no-c-format
 msgid "The <literal>hilo</literal> and <literal>seqhilo</literal> generato=
rs provide two alternate implementations of the hi/lo algorithm, a favorite=
 approach to identifier generation. The first implementation requires a \"s=
pecial\" database table to hold the next available \"hi\" value. The second=
 uses an Oracle-style sequence (where supported)."
 msgstr ""
 =

-#: basic_mapping.xml:835(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:711
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"cat_id\">\n"
+      "        <generator class=3D\"hilo\">\n"
+      "                <param name=3D\"table\">hi_value</param>\n"
+      "                <param name=3D\"column\">next_value</param>\n"
+      "                <param name=3D\"max_lo\">100</param>\n"
+      "        </generator>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:713
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"cat_id\">\n"
+      "        <generator class=3D\"seqhilo\">\n"
+      "                <param name=3D\"sequence\">hi_value</param>\n"
+      "                <param name=3D\"max_lo\">100</param>\n"
+      "        </generator>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:715
+#, no-c-format
 msgid "Unfortunately, you can't use <literal>hilo</literal> when supplying=
 your own <literal>Connection</literal> to Hibernate. When Hibernate is usi=
ng an application server datasource to obtain connections enlisted with JTA=
, you must properly configure the <literal>hibernate.transaction.manager_lo=
okup_class</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:844(title) =

+#. Tag: title
+#: basic_mapping.xml:724
+#, no-c-format
 msgid "UUID algorithm"
 msgstr ""
 =

-#: basic_mapping.xml:845(para) =

+#. Tag: para
+#: basic_mapping.xml:725
+#, no-c-format
 msgid "The UUID contains: IP address, startup time of the JVM (accurate to=
 a quarter second), system time and a counter value (unique within the JVM)=
. It's not possible to obtain a MAC address or memory address from Java cod=
e, so this is the best we can do without using JNI."
 msgstr ""
 =

-#: basic_mapping.xml:854(title) =

+#. Tag: title
+#: basic_mapping.xml:734
+#, no-c-format
 msgid "Identity columns and sequences"
 msgstr ""
 =

-#: basic_mapping.xml:855(para) =

+#. Tag: para
+#: basic_mapping.xml:735
+#, no-c-format
 msgid "For databases which support identity columns (DB2, MySQL, Sybase, M=
S SQL), you may use <literal>identity</literal> key generation. For databas=
es that support sequences (DB2, Oracle, PostgreSQL, Interbase, McKoi, SAP D=
B) you may use <literal>sequence</literal> style key generation. Both these=
 strategies require two SQL queries to insert a new object."
 msgstr ""
 =

-#: basic_mapping.xml:873(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:743
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"person_id\">\=
n"
+      "        <generator class=3D\"sequence\">\n"
+      "                <param name=3D\"sequence\">person_id_sequence</para=
m>\n"
+      "        </generator>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:745
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"person_id\" u=
nsaved-value=3D\"0\">\n"
+      "        <generator class=3D\"identity\"/>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:747
+#, no-c-format
 msgid "For cross-platform development, the <literal>native</literal> strat=
egy will choose from the <literal>identity</literal>, <literal>sequence</li=
teral> and <literal>hilo</literal> strategies, dependant upon the capabilit=
ies of the underlying database."
 msgstr ""
 =

-#: basic_mapping.xml:882(title) =

+#. Tag: title
+#: basic_mapping.xml:756
+#, no-c-format
 msgid "Assigned identifiers"
 msgstr ""
 =

-#: basic_mapping.xml:883(para) =

+#. Tag: para
+#: basic_mapping.xml:757
+#, no-c-format
 msgid "If you want the application to assign identifiers (as opposed to ha=
ving Hibernate generate them), you may use the <literal>assigned</literal> =
generator. This special generator will use the identifier value already ass=
igned to the object's identifier property. This generator is used when the =
primary key is a natural key instead of a surrogate key. This is the defaul=
t behavior if you do no specify a <literal>&lt;generator&gt;</literal> elem=
ent."
 msgstr ""
 =

-#: basic_mapping.xml:892(para) =

+#. Tag: para
+#: basic_mapping.xml:766
+#, no-c-format
 msgid "Choosing the <literal>assigned</literal> generator makes Hibernate =
use <literal>unsaved-value=3D\"undefined\"</literal>, forcing Hibernate to =
go to the database to determine if an instance is transient or detached, un=
less there is a version or timestamp property, or you define <literal>Inter=
ceptor.isUnsaved()</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:902(title) =

+#. Tag: title
+#: basic_mapping.xml:776
+#, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr ""
 =

-#: basic_mapping.xml:903(para) =

+#. Tag: para
+#: basic_mapping.xml:777
+#, no-c-format
 msgid "For legacy schemas only (Hibernate does not generate DDL with trigg=
ers)."
 msgstr ""
 =

-#: basic_mapping.xml:913(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:781
+#, no-c-format
+msgid ""
+      "<![CDATA[<id name=3D\"id\" type=3D\"long\" column=3D\"person_id\">\=
n"
+      "        <generator class=3D\"select\">\n"
+      "                <param name=3D\"key\">socialSecurityNumber</param>\=
n"
+      "        </generator>\n"
+      "</id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:783
+#, no-c-format
 msgid "In the above example, there is a unique valued property named <lite=
ral>socialSecurityNumber</literal> defined by the class, as a natural key, =
and a surrogate key named <literal>person_id</literal> whose value is gener=
ated by a trigger."
 msgstr ""
 =

-#: basic_mapping.xml:925(title) =

+#. Tag: title
+#: basic_mapping.xml:795
+#, no-c-format
 msgid "Enhanced identifier generators"
 msgstr ""
 =

-#: basic_mapping.xml:927(para) =

+#. Tag: para
+#: basic_mapping.xml:797
+#, no-c-format
 msgid "Starting with release 3.2.3, there are 2 new generators which repre=
sent a re-thinking of 2 different aspects of identifier generation. The fir=
st aspect is database portability; the second is optimization (not having t=
o query the database for every request for a new identifier value). These t=
wo new generators are intended to take the place of some of the named gener=
ators described above (starting in 3.3.x); however, they are included in th=
e current releases and can be referenced by FQN."
 msgstr ""
 =

-#: basic_mapping.xml:949(para) =

+#. Tag: para
+#: basic_mapping.xml:805
+#, no-c-format
+msgid "The first of these new generators is <literal>org.hibernate.id.enha=
nced.SequenceStyleGenerator</literal> which is intended firstly as a replac=
ement for the <literal>sequence</literal> generator and secondly as a bette=
r portability generator than <literal>native</literal> (because <literal>na=
tive</literal> (generally) chooses between <literal>identity</literal> and =
<literal>sequence</literal> which have largely different semantics which ca=
n cause subtle isssues in applications eyeing portability). <literal>org.hi=
bernate.id.enhanced.SequenceStyleGenerator</literal> however achieves porta=
bility in a different manner. It chooses between using a table or a sequenc=
e in the database to store its incrementing values depending on the capabil=
ities of the dialect being used. The difference between this and <literal>n=
ative</literal> is that table-based and sequence-based storage have the sam=
e exact semantic (in fact sequences are exactly what Hibernate tries to emm=
ulate with its!
  table-based generators). This generator has a number of configuration par=
ameters:"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:819
+#, no-c-format
 msgid "<literal>sequence_name</literal> (optional, defaults to <literal>hi=
bernate_sequence</literal>): The name of the sequence (or table) to be used=
."
 msgstr ""
 =

-#: basic_mapping.xml:955(para) =

+#. Tag: para
+#: basic_mapping.xml:825
+#, no-c-format
 msgid "<literal>initial_value</literal> (optional, defaults to <literal>1<=
/literal>): The initial value to be retrieved from the sequence/table. In s=
equence creation terms, this is analogous to the clause typical named \"STA=
RTS WITH\"."
 msgstr ""
 =

-#: basic_mapping.xml:962(para) =

+#. Tag: para
+#: basic_mapping.xml:832
+#, no-c-format
 msgid "<literal>increment_size</literal> (optional, defaults to <literal>1=
</literal>): The value by which subsequent calls to the sequence/table shou=
ld differ. In sequence creation terms, this is analogous to the clause typi=
cal named \"INCREMENT BY\"."
 msgstr ""
 =

-#: basic_mapping.xml:969(para) =

+#. Tag: para
+#: basic_mapping.xml:839
+#, no-c-format
 msgid "<literal>force_table_use</literal> (optional, defaults to <literal>=
false</literal>): Should we force the use of a table as the backing structu=
re even though the dialect might support sequence?"
 msgstr ""
 =

-#: basic_mapping.xml:976(para) =

+#. Tag: para
+#: basic_mapping.xml:846
+#, no-c-format
 msgid "<literal>value_column</literal> (optional, defaults to <literal>nex=
t_val</literal>): Only relevant for table structures! The name of the colum=
n on the table which is used to hold the value."
 msgstr ""
 =

-#: basic_mapping.xml:983(para) =

-msgid "<literal>optimizer</literal> (optional, defaults to <literal>none</=
literal>): See <xref linkend=3D\"mapping-declaration-id-enhanced-optimizers=
\"/>"
+#. Tag: para
+#: basic_mapping.xml:853
+#, no-c-format
+msgid "<literal>optimizer</literal> (optional, defaults to <literal>none</=
literal>): See"
 msgstr ""
 =

-#: basic_mapping.xml:935(para) =

-msgid "The first of these new generators is <literal>org.hibernate.id.enha=
nced.SequenceStyleGenerator</literal> which is intended firstly as a replac=
ement for the <literal>sequence</literal> generator and secondly as a bette=
r portability generator than <literal>native</literal> (because <literal>na=
tive</literal> (generally) chooses between <literal>identity</literal> and =
<literal>sequence</literal> which have largely different semantics which ca=
n cause subtle isssues in applications eyeing portability). <literal>org.hi=
bernate.id.enhanced.SequenceStyleGenerator</literal> however achieves porta=
bility in a different manner. It chooses between using a table or a sequenc=
e in the database to store its incrementing values depending on the capabil=
ities of the dialect being used. The difference between this and <literal>n=
ative</literal> is that table-based and sequence-based storage have the sam=
e exact semantic (in fact sequences are exactly what Hibernate tries to emm=
ulate with its!
  table-based generators). This generator has a number of configuration par=
ameters: <placeholder-1/>"
+#. Tag: para
+#: basic_mapping.xml:860
+#, no-c-format
+msgid "The second of these new generators is <literal>org.hibernate.id.enh=
anced.TableGenerator</literal> which is intended firstly as a replacement f=
or the <literal>table</literal> generator (although it actually functions m=
uch more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</lite=
ral>) and secondly as a re-implementation of <literal>org.hibernate.id.Mult=
ipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable optim=
iziers. Essentially this generator defines a table capable of holding a num=
ber of different increment values simultaneously by using multiple distinct=
ly keyed rows. This generator has a number of configuration parameters:"
 msgstr ""
 =

-#: basic_mapping.xml:1000(para) =

+#. Tag: para
+#: basic_mapping.xml:870
+#, no-c-format
 msgid "<literal>table_name</literal> (optional, defaults to <literal>hiber=
nate_sequences</literal>): The name of the table to be used."
 msgstr ""
 =

-#: basic_mapping.xml:1006(para) =

+#. Tag: para
+#: basic_mapping.xml:876
+#, no-c-format
 msgid "<literal>value_column_name</literal> (optional, defaults to <litera=
l>next_val</literal>): The name of the column on the table which is used to=
 hold the value."
 msgstr ""
 =

-#: basic_mapping.xml:1012(para) =

+#. Tag: para
+#: basic_mapping.xml:882
+#, no-c-format
 msgid "<literal>segment_column_name</literal> (optional, defaults to <lite=
ral>sequence_name</literal>): The name of the column on the table which is =
used to hold the \"segement key\". This is the value which distinctly ident=
ifies which increment value to use."
 msgstr ""
 =

-#: basic_mapping.xml:1019(para) =

+#. Tag: para
+#: basic_mapping.xml:889
+#, no-c-format
 msgid "<literal>segment_value</literal> (optional, defaults to <literal>de=
fault</literal>): The \"segment key\" value for the segment from which we w=
ant to pull increment values for this generator."
 msgstr ""
 =

-#: basic_mapping.xml:1026(para) =

+#. Tag: para
+#: basic_mapping.xml:896
+#, no-c-format
 msgid "<literal>segment_value_length</literal> (optional, defaults to <lit=
eral>255</literal>): Used for schema generation; the column size to create =
this segment key column."
 msgstr ""
 =

-#: basic_mapping.xml:1032(para) =

+#. Tag: para
+#: basic_mapping.xml:902
+#, no-c-format
 msgid "<literal>initial_value</literal> (optional, defaults to <literal>1<=
/literal>): The initial value to be retrieved from the table."
 msgstr ""
 =

-#: basic_mapping.xml:1038(para) =

+#. Tag: para
+#: basic_mapping.xml:908
+#, no-c-format
 msgid "<literal>increment_size</literal> (optional, defaults to <literal>1=
</literal>): The value by which subsequent calls to the table should differ=
."
 msgstr ""
 =

-#: basic_mapping.xml:1044(para) =

-msgid "<literal>optimizer</literal> (optional, defaults to <literal/>): Se=
e <xref linkend=3D\"mapping-declaration-id-enhanced-optimizers\"/>"
+#. Tag: para
+#: basic_mapping.xml:914
+#, no-c-format
+msgid "<literal>optimizer</literal> (optional, defaults to <literal></lite=
ral>): See"
 msgstr ""
 =

-#: basic_mapping.xml:990(para) =

-msgid "The second of these new generators is <literal>org.hibernate.id.enh=
anced.TableGenerator</literal> which is intended firstly as a replacement f=
or the <literal>table</literal> generator (although it actually functions m=
uch more like <literal>org.hibernate.id.MultipleHiLoPerTableGenerator</lite=
ral>) and secondly as a re-implementation of <literal>org.hibernate.id.Mult=
ipleHiLoPerTableGenerator</literal> utilizing the notion of pluggable optim=
iziers. Essentially this generator defines a table capable of holding a num=
ber of different increment values simultaneously by using multiple distinct=
ly keyed rows. This generator has a number of configuration parameters: <pl=
aceholder-1/>"
+#. Tag: title
+#: basic_mapping.xml:924
+#, no-c-format
+msgid "Identifier generator optimization"
 msgstr ""
 =

-#: basic_mapping.xml:1054(title) =

-msgid "Identifier generator optimization"
+#. Tag: para
+#: basic_mapping.xml:925
+#, no-c-format
+msgid "For identifier generators which store values in the database, it is=
 inefficient for them to hit the database on each and every call to generat=
e a new identifier value. Instead, you'd ideally want to group a bunch of t=
hem in memory and only hit the database when you have exhausted your in-mem=
ory value group. This is the role of the pluggable optimizers. Currently on=
ly the two enhanced generators (<xref linkend=3D\"mapping-declaration-id-en=
hanced\"/> support this notion."
 msgstr ""
 =

-#: basic_mapping.xml:1063(para) =

+#. Tag: para
+#: basic_mapping.xml:933
+#, no-c-format
 msgid "<literal>none</literal> (generally this is the default if no optimi=
zer was specified): This says to not perform any optimizations, and hit the=
 database each and every request."
 msgstr ""
 =

-#: basic_mapping.xml:1069(para) =

+#. Tag: para
+#: basic_mapping.xml:939
+#, no-c-format
 msgid "<literal>hilo</literal>: applies a hi/lo algorithm around the datab=
ase retrieved values. The values from the database for this optimizer are e=
xpected to be sequential. The values retrieved from the database structure =
for this optimizer indicates the \"group number\"; the <literal>increment_s=
ize</literal> is multiplied by that value in memory to define a group \"hi =
value\"."
 msgstr ""
 =

-#: basic_mapping.xml:1078(para) =

+#. Tag: para
+#: basic_mapping.xml:948
+#, no-c-format
 msgid "<literal>pooled</literal>: like was discussed for <literal>hilo</li=
teral>, this optimizers attempts to minimize the number of hits to the data=
base. Here, however, we simply store the starting value for the \"next grou=
p\" into the database structure rather than a sequential value in combinati=
on with an in-memory grouping algorithm. <literal>increment_size</literal> =
here refers to the values coming from the database."
 msgstr ""
 =

-#: basic_mapping.xml:1055(para) =

-msgid "For identifier generators which store values in the database, it is=
 inefficient for them to hit the database on each and every call to generat=
e a new identifier value. Instead, you'd ideally want to group a bunch of t=
hem in memory and only hit the database when you have exhausted your in-mem=
ory value group. This is the role of the pluggable optimizers. Currently on=
ly the two enhanced generators (<xref linkend=3D\"mapping-declaration-id-en=
hanced\"/> support this notion. <placeholder-1/>"
+#. Tag: title
+#: basic_mapping.xml:961
+#, no-c-format
+msgid "composite-id"
 msgstr ""
 =

-#: basic_mapping.xml:1091(title) =

-msgid "composite-id"
+#. Tag: programlisting
+#: basic_mapping.xml:963
+#, no-c-format
+msgid ""
+      "<![CDATA[<composite-id\n"
+      "        name=3D\"propertyName\"\n"
+      "        class=3D\"ClassName\"\n"
+      "        mapped=3D\"true|false\"\n"
+      "        access=3D\"field|property|ClassName\">\n"
+      "        node=3D\"element-name|.\"\n"
+      "\n"
+      "        <key-property name=3D\"propertyName\" type=3D\"typename\" c=
olumn=3D\"column_name\"/>\n"
+      "        <key-many-to-one name=3D\"propertyName class=3D\"ClassName\=
" column=3D\"column_name\"/>\n"
+      "        ......\n"
+      "</composite-id>]]>"
 msgstr ""
 =

-#: basic_mapping.xml:1105(para) =

+#. Tag: para
+#: basic_mapping.xml:965
+#, no-c-format
 msgid "For a table with a composite key, you may map multiple properties o=
f the class as identifier properties. The <literal>&lt;composite-id&gt;</li=
teral> element accepts <literal>&lt;key-property&gt;</literal> property map=
pings and <literal>&lt;key-many-to-one&gt;</literal> mappings as child elem=
ents."
 msgstr ""
 =

-#: basic_mapping.xml:1117(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:972
+#, no-c-format
+msgid ""
+      "<![CDATA[<composite-id>\n"
+      "        <key-property name=3D\"medicareNumber\"/>\n"
+      "        <key-property name=3D\"dependent\"/>\n"
+      "</composite-id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:974
+#, no-c-format
 msgid "Your persistent class <emphasis>must</emphasis> override <literal>e=
quals()</literal> and <literal>hashCode()</literal> to implement composite =
identifier equality. It must also implements <literal>Serializable</literal=
>."
 msgstr ""
 =

-#: basic_mapping.xml:1123(para) =

+#. Tag: para
+#: basic_mapping.xml:980
+#, no-c-format
 msgid "Unfortunately, this approach to composite identifiers means that a =
persistent object is its own identifier. There is no convenient \"handle\" =
other than the object itself. You must instantiate an instance of the persi=
stent class itself and populate its identifier properties before you can <l=
iteral>load()</literal> the persistent state associated with a composite ke=
y. We call this approach an <emphasis>embedded</emphasis> composite identif=
ier, and discourage it for serious applications."
 msgstr ""
 =

-#: basic_mapping.xml:1132(para) =

+#. Tag: para
+#: basic_mapping.xml:989
+#, no-c-format
 msgid "A second approach is what we call a <emphasis>mapped</emphasis> com=
posite identifier, where the identifier properties named inside the <litera=
l>&lt;composite-id&gt;</literal> element are duplicated on both the persist=
ent class and a separate identifier class."
 msgstr ""
 =

-#: basic_mapping.xml:1143(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:995
+#, no-c-format
+msgid ""
+      "<![CDATA[<composite-id class=3D\"MedicareId\" mapped=3D\"true\">\n"
+      "        <key-property name=3D\"medicareNumber\"/>\n"
+      "        <key-property name=3D\"dependent\"/>\n"
+      "</composite-id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:997
+#, no-c-format
 msgid "In this example, both the composite identifier class, <literal>Medi=
careId</literal>, and the entity class itself have properties named <litera=
l>medicareNumber</literal> and <literal>dependent</literal>. The identifier=
 class must override <literal>equals()</literal> and <literal>hashCode()</l=
iteral> and implement. <literal>Serializable</literal>. The disadvantage of=
 this approach is quite obvious&mdash;code duplication."
 msgstr ""
 =

-#: basic_mapping.xml:1152(para) =

+#. Tag: para
+#: basic_mapping.xml:1006
+#, no-c-format
 msgid "The following attributes are used to specify a mapped composite ide=
ntifier:"
 msgstr ""
 =

-#: basic_mapping.xml:1158(para) =

+#. Tag: para
+#: basic_mapping.xml:1012
+#, no-c-format
 msgid "<literal>mapped</literal> (optional, defaults to <literal>false</li=
teral>): indicates that a mapped composite identifier is used, and that the=
 contained property mappings refer to both the entity class and the composi=
te identifier class."
 msgstr ""
 =

-#: basic_mapping.xml:1166(para) =

+#. Tag: para
+#: basic_mapping.xml:1020
+#, no-c-format
 msgid "<literal>class</literal> (optional, but required for a mapped compo=
site identifier): The class used as a composite identifier."
 msgstr ""
 =

-#: basic_mapping.xml:1173(para) =

+#. Tag: para
+#: basic_mapping.xml:1027
+#, no-c-format
 msgid "We will describe a third, even more convenient approach where the c=
omposite identifier is implemented as a component class in <xref linkend=3D=
\"components-compositeid\"/>. The attributes described below apply only to =
this alternative approach:"
 msgstr ""
 =

-#: basic_mapping.xml:1181(para) =

+#. Tag: para
+#: basic_mapping.xml:1035
+#, no-c-format
 msgid "<literal>name</literal> (optional, required for this approach): A p=
roperty of component type that holds the composite identifier (see chapter =
9)."
 msgstr ""
 =

-#: basic_mapping.xml:1193(para) =

+#. Tag: para
+#: basic_mapping.xml:1047
+#, no-c-format
 msgid "<literal>class</literal> (optional - defaults to the property type =
determined by reflection): The component class used as a composite identifi=
er (see next section)."
 msgstr ""
 =

-#: basic_mapping.xml:1200(para) =

+#. Tag: para
+#: basic_mapping.xml:1054
+#, no-c-format
 msgid "This third approach, an <emphasis>identifier component</emphasis> i=
s the one we recommend for almost all applications."
 msgstr ""
 =

-#: basic_mapping.xml:1208(title) =

+#. Tag: title
+#: basic_mapping.xml:1062
+#, no-c-format
 msgid "discriminator"
 msgstr ""
 =

-#: basic_mapping.xml:1210(para) =

+#. Tag: para
+#: basic_mapping.xml:1064
+#, no-c-format
 msgid "The <literal>&lt;discriminator&gt;</literal> element is required fo=
r polymorphic persistence using the table-per-class-hierarchy mapping strat=
egy and declares a discriminator column of the table. The discriminator col=
umn contains marker values that tell the persistence layer what subclass to=
 instantiate for a particular row. A restricted set of types may be used: <=
literal>string</literal>, <literal>character</literal>, <literal>integer</l=
iteral>, <literal>byte</literal>, <literal>short</literal>, <literal>boolea=
n</literal>, <literal>yes_no</literal>, <literal>true_false</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:1237(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1082
+#, no-c-format
+msgid ""
+      "<![CDATA[<discriminator\n"
+      "        column=3D\"discriminator_column\"\n"
+      "        type=3D\"discriminator_type\"\n"
+      "        force=3D\"true|false\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        formula=3D\"arbitrary sql expression\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1085
+#, no-c-format
 msgid "<literal>column</literal> (optional - defaults to <literal>class</l=
iteral>) the name of the discriminator column."
 msgstr ""
 =

-#: basic_mapping.xml:1243(para) =

+#. Tag: para
+#: basic_mapping.xml:1091
+#, no-c-format
 msgid "<literal>type</literal> (optional - defaults to <literal>string</li=
teral>) a name that indicates the Hibernate type"
 msgstr ""
 =

-#: basic_mapping.xml:1249(para) =

+#. Tag: para
+#: basic_mapping.xml:1097
+#, no-c-format
 msgid "<literal>force</literal> (optional - defaults to <literal>false</li=
teral>) \"force\" Hibernate to specify allowed discriminator values even wh=
en retrieving all instances of the root class."
 msgstr ""
 =

-#: basic_mapping.xml:1256(para) =

+#. Tag: para
+#: basic_mapping.xml:1104
+#, no-c-format
 msgid "<literal>insert</literal> (optional - defaults to <literal>true</li=
teral>) set this to <literal>false</literal> if your discriminator column i=
s also part of a mapped composite identifier. (Tells Hibernate to not inclu=
de the column in SQL <literal>INSERT</literal>s.)"
 msgstr ""
 =

-#: basic_mapping.xml:1264(para) =

+#. Tag: para
+#: basic_mapping.xml:1112
+#, no-c-format
 msgid "<literal>formula</literal> (optional) an arbitrary SQL expression t=
hat is executed when a type has to be evaluated. Allows content-based discr=
imination."
 msgstr ""
 =

-#: basic_mapping.xml:1272(para) =

+#. Tag: para
+#: basic_mapping.xml:1120
+#, no-c-format
 msgid "Actual values of the discriminator column are specified by the <lit=
eral>discriminator-value</literal> attribute of the <literal>&lt;class&gt;<=
/literal> and <literal>&lt;subclass&gt;</literal> elements."
 msgstr ""
 =

-#: basic_mapping.xml:1278(para) =

+#. Tag: para
+#: basic_mapping.xml:1126
+#, no-c-format
 msgid "The <literal>force</literal> attribute is (only) useful if the tabl=
e contains rows with \"extra\" discriminator values that are not mapped to =
a persistent class. This will not usually be the case."
 msgstr ""
 =

-#: basic_mapping.xml:1284(para) =

+#. Tag: para
+#: basic_mapping.xml:1132
+#, no-c-format
 msgid "Using the <literal>formula</literal> attribute you can declare an a=
rbitrary SQL expression that will be used to evaluate the type of a row:"
 msgstr ""
 =

-#: basic_mapping.xml:1296(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:1137
+#, no-c-format
+msgid ""
+      "<![CDATA[<discriminator\n"
+      "    formula=3D\"case when CLASS_TYPE in ('a', 'b', 'c') then 0 else=
 1 end\"\n"
+      "    type=3D\"integer\"/>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:1142
+#, no-c-format
 msgid "version (optional)"
 msgstr ""
 =

-#: basic_mapping.xml:1298(para) =

+#. Tag: para
+#: basic_mapping.xml:1144
+#, no-c-format
 msgid "The <literal>&lt;version&gt;</literal> element is optional and indi=
cates that the table contains versioned data. This is particularly useful i=
f you plan to use <emphasis>long transactions</emphasis> (see below)."
 msgstr ""
 =

-#: basic_mapping.xml:1326(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1160
+#, no-c-format
+msgid ""
+      "<![CDATA[<version\n"
+      "        column=3D\"version_column\"\n"
+      "        name=3D\"propertyName\"\n"
+      "        type=3D\"typename\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        unsaved-value=3D\"null|negative|undefined\"\n"
+      "        generated=3D\"never|always\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1163
+#, no-c-format
 msgid "<literal>column</literal> (optional - defaults to the property name=
): The name of the column holding the version number."
 msgstr ""
 =

-#: basic_mapping.xml:1332(para) =

+#. Tag: para
+#: basic_mapping.xml:1169
+#, no-c-format
 msgid "<literal>name</literal>: The name of a property of the persistent c=
lass."
 msgstr ""
 =

-#: basic_mapping.xml:1337(para) =

+#. Tag: para
+#: basic_mapping.xml:1174
+#, no-c-format
 msgid "<literal>type</literal> (optional - defaults to <literal>integer</l=
iteral>): The type of the version number."
 msgstr ""
 =

-#: basic_mapping.xml:1349(para) =

+#. Tag: para
+#: basic_mapping.xml:1186
+#, no-c-format
 msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>u=
ndefined</literal>): A version property value that indicates that an instan=
ce is newly instantiated (unsaved), distinguishing it from detached instanc=
es that were saved or loaded in a previous session. (<literal>undefined</li=
teral> specifies that the identifier property value should be used.)"
 msgstr ""
 =

-#: basic_mapping.xml:1358(para) =

-msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this version property value is actually generat=
ed by the database. See the discussion of <xref linkend=3D\"mapping-generat=
ed\">generated properties</xref>."
+#. Tag: para
+#: basic_mapping.xml:1195
+#, no-c-format
+msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this version property value is actually generat=
ed by the database. See the discussion of <link linkend=3D\"mapping-generat=
ed\">generated properties</link>."
 msgstr ""
 =

-#: basic_mapping.xml:1365(para) =

+#. Tag: para
+#: basic_mapping.xml:1202
+#, no-c-format
 msgid "<literal>insert</literal> (optional - defaults to <literal>true</li=
teral>): Specifies whether the version column should be included in SQL ins=
ert statements. May be set to <literal>false</literal> if and only if the d=
atabase column is defined with a default value of <literal>0</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:1375(para) =

+#. Tag: para
+#: basic_mapping.xml:1212
+#, no-c-format
 msgid "Version numbers may be of Hibernate type <literal>long</literal>, <=
literal>integer</literal>, <literal>short</literal>, <literal>timestamp</li=
teral> or <literal>calendar</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:1380(para) =

+#. Tag: para
+#: basic_mapping.xml:1217
+#, no-c-format
 msgid "A version or timestamp property should never be null for a detached=
 instance, so Hibernate will detect any instance with a null version or tim=
estamp as transient, no matter what other <literal>unsaved-value</literal> =
strategies are specified. <emphasis>Declaring a nullable version or timesta=
mp property is an easy way to avoid any problems with transitive reattachme=
nt in Hibernate, especially useful for people using assigned identifiers or=
 composite keys!</emphasis>"
 msgstr ""
 =

-#: basic_mapping.xml:1391(title) =

+#. Tag: title
+#: basic_mapping.xml:1228
+#, no-c-format
 msgid "timestamp (optional)"
 msgstr ""
 =

-#: basic_mapping.xml:1393(para) =

+#. Tag: para
+#: basic_mapping.xml:1230
+#, no-c-format
 msgid "The optional <literal>&lt;timestamp&gt;</literal> element indicates=
 that the table contains timestamped data. This is intended as an alternati=
ve to versioning. Timestamps are by nature a less safe implementation of op=
timistic locking. However, sometimes the application might use the timestam=
ps in other ways."
 msgstr ""
 =

-#: basic_mapping.xml:1420(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1246
+#, no-c-format
+msgid ""
+      "<![CDATA[<timestamp\n"
+      "        column=3D\"timestamp_column\"\n"
+      "        name=3D\"propertyName\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        unsaved-value=3D\"null|undefined\"\n"
+      "        source=3D\"vm|db\"\n"
+      "        generated=3D\"never|always\"\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1249
+#, no-c-format
 msgid "<literal>column</literal> (optional - defaults to the property name=
): The name of a column holding the timestamp."
 msgstr ""
 =

-#: basic_mapping.xml:1426(para) =

+#. Tag: para
+#: basic_mapping.xml:1255
+#, no-c-format
 msgid "<literal>name</literal>: The name of a JavaBeans style property of =
Java type <literal>Date</literal> or <literal>Timestamp</literal> of the pe=
rsistent class."
 msgstr ""
 =

-#: basic_mapping.xml:1439(para) =

+#. Tag: para
+#: basic_mapping.xml:1268
+#, no-c-format
 msgid "<literal>unsaved-value</literal> (optional - defaults to <literal>n=
ull</literal>): A version property value that indicates that an instance is=
 newly instantiated (unsaved), distinguishing it from detached instances th=
at were saved or loaded in a previous session. (<literal>undefined</literal=
> specifies that the identifier property value should be used.)"
 msgstr ""
 =

-#: basic_mapping.xml:1448(para) =

+#. Tag: para
+#: basic_mapping.xml:1277
+#, no-c-format
 msgid "<literal>source</literal> (optional - defaults to <literal>vm</lite=
ral>): From where should Hibernate retrieve the timestamp value? From the d=
atabase, or from the current JVM? Database-based timestamps incur an overhe=
ad because Hibernate must hit the database in order to determine the \"next=
 value\", but will be safer for use in clustered environments. Note also, t=
hat not all <literal>Dialect</literal>s are known to support retrieving of =
the database's current timestamp, while others might be unsafe for usage in=
 locking due to lack of precision (Oracle 8 for example)."
 msgstr ""
 =

-#: basic_mapping.xml:1460(para) =

-msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this timestamp property value is actually gener=
ated by the database. See the discussion of <xref linkend=3D\"mapping-gener=
ated\">generated properties</xref>."
+#. Tag: para
+#: basic_mapping.xml:1289
+#, no-c-format
+msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this timestamp property value is actually gener=
ated by the database. See the discussion of <link linkend=3D\"mapping-gener=
ated\">generated properties</link>."
 msgstr ""
 =

-#: basic_mapping.xml:1469(para) =

+#. Tag: para
+#: basic_mapping.xml:1298
+#, no-c-format
 msgid "Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <li=
teral>&lt;version type=3D\"timestamp\"&gt;</literal>. And <literal>&lt;time=
stamp source=3D\"db\"&gt;</literal> is equivalent to <literal>&lt;version t=
ype=3D\"dbtimestamp\"&gt;</literal>"
 msgstr ""
 =

-#: basic_mapping.xml:1479(title) =

+#. Tag: title
+#: basic_mapping.xml:1308
+#, no-c-format
 msgid "property"
 msgstr ""
 =

-#: basic_mapping.xml:1481(para) =

+#. Tag: para
+#: basic_mapping.xml:1310
+#, no-c-format
 msgid "The <literal>&lt;property&gt;</literal> element declares a persiste=
nt, JavaBean style property of the class."
 msgstr ""
 =

-#: basic_mapping.xml:1525(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1332
+#, no-c-format
+msgid ""
+      "<![CDATA[<property\n"
+      "        name=3D\"propertyName\"\n"
+      "        column=3D\"column_name\"\n"
+      "        type=3D\"typename\"\n"
+      "        update=3D\"true|false\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        formula=3D\"arbitrary SQL expression\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        not-null=3D\"true|false\"\n"
+      "        optimistic-lock=3D\"true|false\"\n"
+      "        generated=3D\"never|insert|always\"\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "        index=3D\"index_name\"\n"
+      "        unique_key=3D\"unique_key_id\"\n"
+      "        length=3D\"L\"\n"
+      "        precision=3D\"P\"\n"
+      "        scale=3D\"S\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1335
+#, no-c-format
 msgid "<literal>name</literal>: the name of the property, with an initial =
lowercase letter."
 msgstr ""
 =

-#: basic_mapping.xml:1531(para) =

+#. Tag: para
+#: basic_mapping.xml:1341
+#, no-c-format
 msgid "<literal>column</literal> (optional - defaults to the property name=
): the name of the mapped database table column. This may also be specified=
 by nested <literal>&lt;column&gt;</literal> element(s)."
 msgstr ""
 =

-#: basic_mapping.xml:1538(para) =

+#. Tag: para
+#: basic_mapping.xml:1348
+#, no-c-format
 msgid "<literal>type</literal> (optional): a name that indicates the Hiber=
nate type."
 msgstr ""
 =

-#: basic_mapping.xml:1543(para) =

+#. Tag: para
+#: basic_mapping.xml:1353
+#, no-c-format
 msgid "<literal>update, insert</literal> (optional - defaults to <literal>=
true</literal>) : specifies that the mapped columns should be included in S=
QL <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. S=
etting both to <literal>false</literal> allows a pure \"derived\" property =
whose value is initialized from some other property that maps to the same c=
olum(s) or by a trigger or other application."
 msgstr ""
 =

-#: basic_mapping.xml:1552(para) =

+#. Tag: para
+#: basic_mapping.xml:1362
+#, no-c-format
 msgid "<literal>formula</literal> (optional): an SQL expression that defin=
es the value for a <emphasis>computed</emphasis> property. Computed propert=
ies do not have a column mapping of their own."
 msgstr ""
 =

-#: basic_mapping.xml:1565(para) =

+#. Tag: para
+#: basic_mapping.xml:1375
+#, no-c-format
 msgid "<literal>lazy</literal> (optional - defaults to <literal>false</lit=
eral>): Specifies that this property should be fetched lazily when the inst=
ance variable is first accessed (requires build-time bytecode instrumentati=
on)."
 msgstr ""
 =

-#: basic_mapping.xml:1572(para) =

+#. Tag: para
+#: basic_mapping.xml:1382
+#, no-c-format
 msgid "<literal>unique</literal> (optional): Enable the DDL generation of =
a unique constraint for the columns. Also, allow this to be the target of a=
 <literal>property-ref</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:1579(para) =

+#. Tag: para
+#: basic_mapping.xml:1389
+#, no-c-format
 msgid "<literal>not-null</literal> (optional): Enable the DDL generation o=
f a nullability constraint for the columns."
 msgstr ""
 =

-#: basic_mapping.xml:1585(para) =

+#. Tag: para
+#: basic_mapping.xml:1395
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Specifies that updates to this property do or do not requ=
ire acquisition of the optimistic lock. In other words, determines if a ver=
sion increment should occur when this property is dirty."
 msgstr ""
 =

-#: basic_mapping.xml:1593(para) =

-msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this property value is actually generated by th=
e database. See the discussion of <xref linkend=3D\"mapping-generated\">gen=
erated properties</xref>."
+#. Tag: para
+#: basic_mapping.xml:1403
+#, no-c-format
+msgid "<literal>generated</literal> (optional - defaults to <literal>never=
</literal>): Specifies that this property value is actually generated by th=
e database. See the discussion of <link linkend=3D\"mapping-generated\">gen=
erated properties</link>."
 msgstr ""
 =

-#: basic_mapping.xml:1602(para) =

+#. Tag: para
+#: basic_mapping.xml:1412
+#, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr ""
 =

-#: basic_mapping.xml:1608(para) =

+#. Tag: para
+#: basic_mapping.xml:1418
+#, no-c-format
 msgid "The name of a Hibernate basic type (eg. <literal>integer, string, c=
haracter, date, timestamp, float, binary, serializable, object, blob</liter=
al>)."
 msgstr ""
 =

-#: basic_mapping.xml:1614(para) =

+#. Tag: para
+#: basic_mapping.xml:1424
+#, no-c-format
 msgid "The name of a Java class with a default basic type (eg. <literal>in=
t, float, char, java.lang.String, java.util.Date, java.lang.Integer, java.s=
ql.Clob</literal>)."
 msgstr ""
 =

-#: basic_mapping.xml:1620(para) =

+#. Tag: para
+#: basic_mapping.xml:1430
+#, no-c-format
 msgid "The name of a serializable Java class."
 msgstr ""
 =

-#: basic_mapping.xml:1625(para) =

+#. Tag: para
+#: basic_mapping.xml:1435
+#, no-c-format
 msgid "The class name of a custom type (eg. <literal>com.illflow.type.MyCu=
stomType</literal>)."
 msgstr ""
 =

-#: basic_mapping.xml:1631(para) =

+#. Tag: para
+#: basic_mapping.xml:1441
+#, no-c-format
 msgid "If you do not specify a type, Hibernate will use reflection upon th=
e named property to take a guess at the correct Hibernate type. Hibernate w=
ill try to interpret the name of the return class of the property getter us=
ing rules 2, 3, 4 in that order. However, this is not always enough. In cer=
tain cases you will still need the <literal>type</literal> attribute. (For =
example, to distinguish between <literal>Hibernate.DATE</literal> and <lite=
ral>Hibernate.TIMESTAMP</literal>, or to specify a custom type.)"
 msgstr ""
 =

-#: basic_mapping.xml:1641(para) =

+#. Tag: para
+#: basic_mapping.xml:1451
+#, no-c-format
 msgid "The <literal>access</literal> attribute lets you control how Hibern=
ate will access the property at runtime. By default, Hibernate will call th=
e property get/set pair. If you specify <literal>access=3D\"field\"</litera=
l>, Hibernate will bypass the get/set pair and access the field directly, u=
sing reflection. You may specify your own strategy for property access by n=
aming a class that implements the interface <literal>org.hibernate.property=
.PropertyAccessor</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:1650(para) =

+#. Tag: para
+#: basic_mapping.xml:1460
+#, no-c-format
 msgid "An especially powerful feature are derived properties. These proper=
ties are by definition read-only, the property value is computed at load ti=
me. You declare the computation as a SQL expression, this translates to a <=
literal>SELECT</literal> clause subquery in the SQL query that loads an ins=
tance:"
 msgstr ""
 =

-#: basic_mapping.xml:1664(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1467
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "<property name=3D\"totalPrice\"\n"
+      "    formula=3D\"( SELECT SUM (li.quantity*p.price) FROM LineItem li=
, Product p\n"
+      "                WHERE li.productId =3D p.productId\n"
+      "                AND li.customerId =3D customerId\n"
+      "                AND li.orderNumber =3D orderNumber )\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1469
+#, no-c-format
 msgid "Note that you can reference the entities own table by not declaring=
 an alias on a particular column (<literal>customerId</literal> in the give=
n example). Also note that you can use the nested <literal>&lt;formula&gt;<=
/literal> mapping element if you don't like to use the attribute."
 msgstr ""
 =

-#: basic_mapping.xml:1674(title) =

+#. Tag: title
+#: basic_mapping.xml:1479
+#, no-c-format
 msgid "many-to-one"
 msgstr ""
 =

-#: basic_mapping.xml:1676(para) =

+#. Tag: para
+#: basic_mapping.xml:1481
+#, no-c-format
 msgid "An ordinary association to another persistent class is declared usi=
ng a <literal>many-to-one</literal> element. The relational model is a many=
-to-one association: a foreign key in one table is referencing the primary =
key column(s) of the target table."
 msgstr ""
 =

-#: basic_mapping.xml:1729(para) basic_mapping.xml:1924(para) basic_mapping=
.xml:2139(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1509
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one\n"
+      "        name=3D\"propertyName\"\n"
+      "        column=3D\"column_name\"\n"
+      "        class=3D\"ClassName\"\n"
+      "        cascade=3D\"cascade_style\"\n"
+      "        fetch=3D\"join|select\"\n"
+      "        update=3D\"true|false\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        property-ref=3D\"propertyNameFromAssociatedClass\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        not-null=3D\"true|false\"\n"
+      "        optimistic-lock=3D\"true|false\"\n"
+      "        lazy=3D\"proxy|no-proxy|false\"\n"
+      "        not-found=3D\"ignore|exception\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        formula=3D\"arbitrary SQL expression\"\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "        embed-xml=3D\"true|false\"\n"
+      "        index=3D\"index_name\"\n"
+      "        unique_key=3D\"unique_key_id\"\n"
+      "        foreign-key=3D\"foreign_key_name\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
+#, no-c-format
 msgid "<literal>name</literal>: The name of the property."
 msgstr ""
 =

-#: basic_mapping.xml:1734(para) basic_mapping.xml:2703(para) =

+#. Tag: para
+#: basic_mapping.xml:1517 basic_mapping.xml:2308
+#, no-c-format
 msgid "<literal>column</literal> (optional): The name of the foreign key c=
olumn. This may also be specified by nested <literal>&lt;column&gt;</litera=
l> element(s)."
 msgstr ""
 =

-#: basic_mapping.xml:1741(para) basic_mapping.xml:1929(para) =

+#. Tag: para
+#: basic_mapping.xml:1524 basic_mapping.xml:1698
+#, no-c-format
 msgid "<literal>class</literal> (optional - defaults to the property type =
determined by reflection): The name of the associated class."
 msgstr ""
 =

-#: basic_mapping.xml:1747(para) =

+#. Tag: para
+#: basic_mapping.xml:1530
+#, no-c-format
 msgid "<literal>cascade</literal> (optional): Specifies which operations s=
hould be cascaded from the parent object to the associated object."
 msgstr ""
 =

-#: basic_mapping.xml:1753(para) basic_mapping.xml:1950(para) =

+#. Tag: para
+#: basic_mapping.xml:1536 basic_mapping.xml:1719
+#, no-c-format
 msgid "<literal>fetch</literal> (optional - defaults to <literal>select</l=
iteral>): Chooses between outer-join fetching or sequential select fetching=
."
 msgstr ""
 =

-#: basic_mapping.xml:1759(para) =

+#. Tag: para
+#: basic_mapping.xml:1542
+#, no-c-format
 msgid "<literal>update, insert</literal> (optional - defaults to <literal>=
true</literal>) specifies that the mapped columns should be included in SQL=
 <literal>UPDATE</literal> and/or <literal>INSERT</literal> statements. Set=
ting both to <literal>false</literal> allows a pure \"derived\" association=
 whose value is initialized from some other property that maps to the same =
colum(s) or by a trigger or other application."
 msgstr ""
 =

-#: basic_mapping.xml:1768(para) =

+#. Tag: para
+#: basic_mapping.xml:1551
+#, no-c-format
 msgid "<literal>property-ref</literal>: (optional) The name of a property =
of the associated class that is joined to this foreign key. If not specifie=
d, the primary key of the associated class is used."
 msgstr ""
 =

-#: basic_mapping.xml:1781(para) =

+#. Tag: para
+#: basic_mapping.xml:1564
+#, no-c-format
 msgid "<literal>unique</literal> (optional): Enable the DDL generation of =
a unique constraint for the foreign-key column. Also, allow this to be the =
target of a <literal>property-ref</literal>. This makes the association mul=
tiplicity effectively one to one."
 msgstr ""
 =

-#: basic_mapping.xml:1789(para) =

+#. Tag: para
+#: basic_mapping.xml:1572
+#, no-c-format
 msgid "<literal>not-null</literal> (optional): Enable the DDL generation o=
f a nullability constraint for the foreign key columns."
 msgstr ""
 =

-#: basic_mapping.xml:1795(para) =

+#. Tag: para
+#: basic_mapping.xml:1578
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Specifies that updates to this property do or do not requ=
ire acquisition of the optimistic lock. In other words, dertermines if a ve=
rsion increment should occur when this property is dirty."
 msgstr ""
 =

-#: basic_mapping.xml:1803(para) =

+#. Tag: para
+#: basic_mapping.xml:1586
+#, no-c-format
 msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</lit=
eral>): By default, single point associations are proxied. <literal>lazy=3D=
\"no-proxy\"</literal> specifies that the property should be fetched lazily=
 when the instance variable is first accessed (requires build-time bytecode=
 instrumentation). <literal>lazy=3D\"false\"</literal> specifies that the a=
ssociation will always be eagerly fetched."
 msgstr ""
 =

-#: basic_mapping.xml:1813(para) =

+#. Tag: para
+#: basic_mapping.xml:1596
+#, no-c-format
 msgid "<literal>not-found</literal> (optional - defaults to <literal>excep=
tion</literal>): Specifies how foreign keys that reference missing rows wil=
l be handled: <literal>ignore</literal> will treat a missing row as a null =
association."
 msgstr ""
 =

-#: basic_mapping.xml:1820(para) basic_mapping.xml:1988(para) =

+#. Tag: para
+#: basic_mapping.xml:1603 basic_mapping.xml:1757
+#, no-c-format
 msgid "<literal>entity-name</literal> (optional): The entity name of the a=
ssociated class."
 msgstr ""
 =

-#: basic_mapping.xml:1826(para) =

+#. Tag: para
+#: basic_mapping.xml:1608
+#, no-c-format
 msgid "<literal>formula</literal> (optional): an SQL expression that defin=
es the value for a <emphasis>computed</emphasis> foreign key."
 msgstr ""
 =

-#: basic_mapping.xml:1833(para) =

+#. Tag: para
+#: basic_mapping.xml:1616
+#, no-c-format
 msgid "Setting a value of the <literal>cascade</literal> attribute to any =
meaningful value other than <literal>none</literal> will propagate certain =
operations to the associated object. The meaningful values are the names of=
 Hibernate's basic operations, <literal>persist, merge, delete, save-update=
, evict, replicate, lock, refresh</literal>, as well as the special values =
<literal>delete-orphan</literal> and <literal>all</literal> and comma-separ=
ated combinations of operation names, for example, <literal>cascade=3D\"per=
sist,merge,evict\"</literal> or <literal>cascade=3D\"all,delete-orphan\"</l=
iteral>. See <xref linkend=3D\"objectstate-transitive\"/> for a full explan=
ation. Note that single valued associations (many-to-one and one-to-one ass=
ociations) do not support orphan delete."
 msgstr ""
 =

-#: basic_mapping.xml:1846(para) =

+#. Tag: para
+#: basic_mapping.xml:1629
+#, no-c-format
 msgid "A typical <literal>many-to-one</literal> declaration looks as simpl=
e as this:"
 msgstr ""
 =

-#: basic_mapping.xml:1852(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1633
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"product\" class=3D\"Product\" column=
=3D\"PRODUCT_ID\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1635
+#, no-c-format
 msgid "The <literal>property-ref</literal> attribute should only be used f=
or mapping legacy data where a foreign key refers to a unique key of the as=
sociated table other than the primary key. This is an ugly relational model=
. For example, suppose the <literal>Product</literal> class had a unique se=
rial number, that is not the primary key. (The <literal>unique</literal> at=
tribute controls Hibernate's DDL generation with the SchemaExport tool.)"
 msgstr ""
 =

-#: basic_mapping.xml:1863(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1644
+#, no-c-format
+msgid "<![CDATA[<property name=3D\"serialNumber\" unique=3D\"true\" type=
=3D\"string\" column=3D\"SERIAL_NUMBER\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1646
+#, no-c-format
 msgid "Then the mapping for <literal>OrderItem</literal> might use:"
 msgstr ""
 =

-#: basic_mapping.xml:1869(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1650
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"product\" property-ref=3D\"serialNum=
ber\" column=3D\"PRODUCT_SERIAL_NUMBER\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1652
+#, no-c-format
 msgid "This is certainly not encouraged, however."
 msgstr ""
 =

-#: basic_mapping.xml:1873(para) =

+#. Tag: para
+#: basic_mapping.xml:1656
+#, no-c-format
 msgid "If the referenced unique key comprises multiple properties of the a=
ssociated entity, you should map the referenced properties inside a named <=
literal>&lt;properties&gt;</literal> element."
 msgstr ""
 =

-#: basic_mapping.xml:1878(para) =

+#. Tag: para
+#: basic_mapping.xml:1661
+#, no-c-format
 msgid "If the referenced unique key is the property of a component, you ma=
y specify a property path:"
 msgstr ""
 =

-#: basic_mapping.xml:1887(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:1665
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"owner\" property-ref=3D\"identity.ss=
n\" column=3D\"OWNER_SSN\"/>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:1670
+#, no-c-format
 msgid "one-to-one"
 msgstr ""
 =

-#: basic_mapping.xml:1889(para) =

+#. Tag: para
+#: basic_mapping.xml:1672
+#, no-c-format
 msgid "A one-to-one association to another persistent class is declared us=
ing a <literal>one-to-one</literal> element."
 msgstr ""
 =

-#: basic_mapping.xml:1935(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1690
+#, no-c-format
+msgid ""
+      "<![CDATA[<one-to-one\n"
+      "        name=3D\"propertyName\"\n"
+      "        class=3D\"ClassName\"\n"
+      "        cascade=3D\"cascade_style\"\n"
+      "        constrained=3D\"true|false\"\n"
+      "        fetch=3D\"join|select\"\n"
+      "        property-ref=3D\"propertyNameFromAssociatedClass\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        formula=3D\"any SQL expression\"\n"
+      "        lazy=3D\"proxy|no-proxy|false\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        node=3D\"element-name|@attribute-name|element/@attribute|.\=
"\n"
+      "        embed-xml=3D\"true|false\"\n"
+      "        foreign-key=3D\"foreign_key_name\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1704
+#, no-c-format
 msgid "<literal>cascade</literal> (optional) specifies which operations sh=
ould be cascaded from the parent object to the associated object."
 msgstr ""
 =

-#: basic_mapping.xml:1941(para) =

+#. Tag: para
+#: basic_mapping.xml:1710
+#, no-c-format
 msgid "<literal>constrained</literal> (optional) specifies that a foreign =
key constraint on the primary key of the mapped table references the table =
of the associated class. This option affects the order in which <literal>sa=
ve()</literal> and <literal>delete()</literal> are cascaded, and determines=
 whether the association may be proxied (it is also used by the schema expo=
rt tool)."
 msgstr ""
 =

-#: basic_mapping.xml:1956(para) =

+#. Tag: para
+#: basic_mapping.xml:1725
+#, no-c-format
 msgid "<literal>property-ref</literal>: (optional) The name of a property =
of the associated class that is joined to the primary key of this class. If=
 not specified, the primary key of the associated class is used."
 msgstr ""
 =

-#: basic_mapping.xml:1969(para) =

+#. Tag: para
+#: basic_mapping.xml:1738
+#, no-c-format
 msgid "<literal>formula</literal> (optional): Almost all one to one associ=
ations map to the primary key of the owning entity. In the rare case that t=
his is not the case, you may specify a some other column, columns or expres=
sion to join on using an SQL formula. (See <literal>org.hibernate.test.onet=
ooneformula</literal> for an example.)"
 msgstr ""
 =

-#: basic_mapping.xml:1977(para) =

+#. Tag: para
+#: basic_mapping.xml:1746
+#, no-c-format
 msgid "<literal>lazy</literal> (optional - defaults to <literal>proxy</lit=
eral>): By default, single point associations are proxied. <literal>lazy=3D=
\"no-proxy\"</literal> specifies that the property should be fetched lazily=
 when the instance variable is first accessed (requires build-time bytecode=
 instrumentation). <literal>lazy=3D\"false\"</literal> specifies that the a=
ssociation will always be eagerly fetched. <emphasis>Note that if <literal>=
constrained=3D\"false\"</literal>, proxying is impossible and Hibernate wil=
l eager fetch the association!</emphasis>"
 msgstr ""
 =

-#: basic_mapping.xml:1995(para) =

+#. Tag: para
+#: basic_mapping.xml:1764
+#, no-c-format
 msgid "There are two varieties of one-to-one association:"
 msgstr ""
 =

-#: basic_mapping.xml:1999(para) =

+#. Tag: para
+#: basic_mapping.xml:1768
+#, no-c-format
 msgid "primary key associations"
 msgstr ""
 =

-#: basic_mapping.xml:2002(para) =

+#. Tag: para
+#: basic_mapping.xml:1771
+#, no-c-format
 msgid "unique foreign key associations"
 msgstr ""
 =

-#: basic_mapping.xml:2007(para) =

+#. Tag: para
+#: basic_mapping.xml:1776
+#, no-c-format
 msgid "Primary key associations don't need an extra table column; if two r=
ows are related by the association then the two table rows share the same p=
rimary key value. So if you want two objects to be related by a primary key=
 association, you must make sure that they are assigned the same identifier=
 value!"
 msgstr ""
 =

-#: basic_mapping.xml:2014(para) =

+#. Tag: para
+#: basic_mapping.xml:1783
+#, no-c-format
 msgid "For a primary key association, add the following mappings to <liter=
al>Employee</literal> and <literal>Person</literal>, respectively."
 msgstr ""
 =

-#: basic_mapping.xml:2022(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1788
+#, no-c-format
+msgid "<![CDATA[<one-to-one name=3D\"person\" class=3D\"Person\"/>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:1789
+#, no-c-format
+msgid "<![CDATA[<one-to-one name=3D\"employee\" class=3D\"Employee\" const=
rained=3D\"true\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1791
+#, no-c-format
 msgid "Now we must ensure that the primary keys of related rows in the PER=
SON and EMPLOYEE tables are equal. We use a special Hibernate identifier ge=
neration strategy called <literal>foreign</literal>:"
 msgstr ""
 =

-#: basic_mapping.xml:2040(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1797
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"person\" table=3D\"PERSON\">\n"
+      "    <id name=3D\"id\" column=3D\"PERSON_ID\">\n"
+      "        <generator class=3D\"foreign\">\n"
+      "            <param name=3D\"property\">employee</param>\n"
+      "        </generator>\n"
+      "    </id>\n"
+      "    ...\n"
+      "    <one-to-one name=3D\"employee\"\n"
+      "        class=3D\"Employee\"\n"
+      "        constrained=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1799
+#, no-c-format
 msgid "A newly saved instance of <literal>Person</literal> is then assigne=
d the same primary key value as the <literal>Employee</literal> instance re=
fered with the <literal>employee</literal> property of that <literal>Person=
</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:2046(para) =

+#. Tag: para
+#: basic_mapping.xml:1805
+#, no-c-format
 msgid "Alternatively, a foreign key with a unique constraint, from <litera=
l>Employee</literal> to <literal>Person</literal>, may be expressed as:"
 msgstr ""
 =

-#: basic_mapping.xml:2053(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1810
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"person\" class=3D\"Person\" column=
=3D\"PERSON_ID\" unique=3D\"true\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1812
+#, no-c-format
 msgid "And this association may be made bidirectional by adding the follow=
ing to the <literal>Person</literal> mapping:"
 msgstr ""
 =

-#: basic_mapping.xml:2063(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:1817
+#, no-c-format
+msgid "<![CDATA[<one-to-one name=3D\"employee\" class=3D\"Employee\" prope=
rty-ref=3D\"person\"/>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:1822
+#, no-c-format
 msgid "natural-id"
 msgstr ""
 =

-#: basic_mapping.xml:2071(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1824
+#, no-c-format
+msgid ""
+      "<![CDATA[<natural-id mutable=3D\"true|false\"/>\n"
+      "        <property ... />\n"
+      "        <many-to-one ... />\n"
+      "        ......\n"
+      "</natural-id>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1826
+#, no-c-format
 msgid "Even though we recommend the use of surrogate keys as primary keys,=
 you should still try to identify natural keys for all entities. A natural =
key is a property or combination of properties that is unique and non-null.=
 If it is also immutable, even better. Map the properties of the natural ke=
y inside the <literal>&lt;natural-id&gt;</literal> element. Hibernate will =
generate the necessary unique key and nullability constraints, and your map=
ping will be more self-documenting."
 msgstr ""
 =

-#: basic_mapping.xml:2080(para) =

+#. Tag: para
+#: basic_mapping.xml:1835
+#, no-c-format
 msgid "We strongly recommend that you implement <literal>equals()</literal=
> and <literal>hashCode()</literal> to compare the natural key properties o=
f the entity."
 msgstr ""
 =

-#: basic_mapping.xml:2085(para) =

+#. Tag: para
+#: basic_mapping.xml:1840
+#, no-c-format
 msgid "This mapping is not intended for use with entities with natural pri=
mary keys."
 msgstr ""
 =

-#: basic_mapping.xml:2091(para) =

+#. Tag: para
+#: basic_mapping.xml:1846
+#, no-c-format
 msgid "<literal>mutable</literal> (optional, defaults to <literal>false</l=
iteral>): By default, natural identifier properties as assumed to be immuta=
ble (constant)."
 msgstr ""
 =

-#: basic_mapping.xml:2101(title) =

+#. Tag: title
+#: basic_mapping.xml:1856
+#, no-c-format
 msgid "component, dynamic-component"
 msgstr ""
 =

-#: basic_mapping.xml:2103(para) =

+#. Tag: para
+#: basic_mapping.xml:1858
+#, no-c-format
 msgid "The <literal>&lt;component&gt;</literal> element maps properties of=
 a child object to columns of the table of a parent class. Components may, =
in turn, declare their own properties, components or collections. See \"Com=
ponents\" below."
 msgstr ""
 =

-#: basic_mapping.xml:2144(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1876
+#, no-c-format
+msgid ""
+      "<![CDATA[<component\n"
+      "        name=3D\"propertyName\"\n"
+      "        class=3D\"className\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        update=3D\"true|false\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        optimistic-lock=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        node=3D\"element-name|.\"\n"
+      ">\n"
+      "\n"
+      "        <property ...../>\n"
+      "        <many-to-one .... />\n"
+      "        ........\n"
+      "</component>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1884
+#, no-c-format
 msgid "<literal>class</literal> (optional - defaults to the property type =
determined by reflection): The name of the component (child) class."
 msgstr ""
 =

-#: basic_mapping.xml:2150(para) basic_mapping.xml:2250(para) =

+#. Tag: para
+#: basic_mapping.xml:1890 basic_mapping.xml:1979
+#, no-c-format
 msgid "<literal>insert</literal>: Do the mapped columns appear in SQL <lit=
eral>INSERT</literal>s?"
 msgstr ""
 =

-#: basic_mapping.xml:2156(para) basic_mapping.xml:2256(para) =

+#. Tag: para
+#: basic_mapping.xml:1896 basic_mapping.xml:1985
+#, no-c-format
 msgid "<literal>update</literal>: Do the mapped columns appear in SQL <lit=
eral>UPDATE</literal>s?"
 msgstr ""
 =

-#: basic_mapping.xml:2168(para) =

+#. Tag: para
+#: basic_mapping.xml:1908
+#, no-c-format
 msgid "<literal>lazy</literal> (optional - defaults to <literal>false</lit=
eral>): Specifies that this component should be fetched lazily when the ins=
tance variable is first accessed (requires build-time bytecode instrumentat=
ion)."
 msgstr ""
 =

-#: basic_mapping.xml:2175(para) =

+#. Tag: para
+#: basic_mapping.xml:1915
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Specifies that updates to this component do or do not req=
uire acquisition of the optimistic lock. In other words, determines if a ve=
rsion increment should occur when this property is dirty."
 msgstr ""
 =

-#: basic_mapping.xml:2183(para) basic_mapping.xml:2270(para) =

+#. Tag: para
+#: basic_mapping.xml:1923 basic_mapping.xml:1999
+#, no-c-format
 msgid "<literal>unique</literal> (optional - defaults to <literal>false</l=
iteral>): Specifies that a unique constraint exists upon all mapped columns=
 of the component."
 msgstr ""
 =

-#: basic_mapping.xml:2192(para) =

+#. Tag: para
+#: basic_mapping.xml:1932
+#, no-c-format
 msgid "The child <literal>&lt;property&gt;</literal> tags map properties o=
f the child class to table columns."
 msgstr ""
 =

-#: basic_mapping.xml:2197(para) =

+#. Tag: para
+#: basic_mapping.xml:1937
+#, no-c-format
 msgid "The <literal>&lt;component&gt;</literal> element allows a <literal>=
&lt;parent&gt;</literal> subelement that maps a property of the component c=
lass as a reference back to the containing entity."
 msgstr ""
 =

-#: basic_mapping.xml:2203(para) =

+#. Tag: para
+#: basic_mapping.xml:1943
+#, no-c-format
 msgid "The <literal>&lt;dynamic-component&gt;</literal> element allows a <=
literal>Map</literal> to be mapped as a component, where the property names=
 refer to keys of the map, see <xref linkend=3D\"components-dynamic\"/>."
 msgstr ""
 =

-#: basic_mapping.xml:2212(title) =

+#. Tag: title
+#: basic_mapping.xml:1952
+#, no-c-format
 msgid "properties"
 msgstr ""
 =

-#: basic_mapping.xml:2214(para) =

+#. Tag: para
+#: basic_mapping.xml:1954
+#, no-c-format
 msgid "The <literal>&lt;properties&gt;</literal> element allows the defini=
tion of a named, logical grouping of properties of a class. The most import=
ant use of the construct is that it allows a combination of properties to b=
e the target of a <literal>property-ref</literal>. It is also a convenient =
way to define a multi-column unique constraint."
 msgstr ""
 =

-#: basic_mapping.xml:2244(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:1970
+#, no-c-format
+msgid ""
+      "<![CDATA[<properties\n"
+      "        name=3D\"logicalName\"\n"
+      "        insert=3D\"true|false\"\n"
+      "        update=3D\"true|false\"\n"
+      "        optimistic-lock=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      ">\n"
+      "\n"
+      "        <property ...../>\n"
+      "        <many-to-one .... />\n"
+      "        ........\n"
+      "</properties>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:1973
+#, no-c-format
 msgid "<literal>name</literal>: The logical name of the grouping - <emphas=
is>not</emphasis> an actual property name."
 msgstr ""
 =

-#: basic_mapping.xml:2262(para) =

+#. Tag: para
+#: basic_mapping.xml:1991
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Specifies that updates to these properties do or do not r=
equire acquisition of the optimistic lock. In other words, determines if a =
version increment should occur when these properties are dirty."
 msgstr ""
 =

-#: basic_mapping.xml:2279(para) =

+#. Tag: para
+#: basic_mapping.xml:2008
+#, no-c-format
 msgid "For example, if we have the following <literal>&lt;properties&gt;</=
literal> mapping:"
 msgstr ""
 =

-#: basic_mapping.xml:2294(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2012
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"personNumber\"/>\n"
+      "    ...\n"
+      "    <properties name=3D\"name\"\n"
+      "            unique=3D\"true\" update=3D\"false\">\n"
+      "        <property name=3D\"firstName\"/>\n"
+      "        <property name=3D\"initial\"/>\n"
+      "        <property name=3D\"lastName\"/>\n"
+      "    </properties>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2014
+#, no-c-format
 msgid "Then we might have some legacy data association which refers to thi=
s unique key of the <literal>Person</literal> table, instead of to the prim=
ary key:"
 msgstr ""
 =

-#: basic_mapping.xml:2306(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2019
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one name=3D\"person\"\n"
+      "         class=3D\"Person\" property-ref=3D\"name\">\n"
+      "    <column name=3D\"firstName\"/>\n"
+      "    <column name=3D\"initial\"/>\n"
+      "    <column name=3D\"lastName\"/>\n"
+      "</many-to-one>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2021
+#, no-c-format
 msgid "We don't recommend the use of this kind of thing outside the contex=
t of mapping legacy data."
 msgstr ""
 =

-#: basic_mapping.xml:2314(title) =

+#. Tag: title
+#: basic_mapping.xml:2029
+#, no-c-format
 msgid "subclass"
 msgstr ""
 =

-#: basic_mapping.xml:2316(para) =

+#. Tag: para
+#: basic_mapping.xml:2031
+#, no-c-format
 msgid "Finally, polymorphic persistence requires the declaration of each s=
ubclass of the root persistent class. For the table-per-class-hierarchy map=
ping strategy, the <literal>&lt;subclass&gt;</literal> declaration is used."
 msgstr ""
 =

-#: basic_mapping.xml:2345(para) basic_mapping.xml:2422(para) basic_mapping=
.xml:2533(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2044
+#, no-c-format
+msgid ""
+      "<![CDATA[<subclass\n"
+      "        name=3D\"ClassName\"\n"
+      "        discriminator-value=3D\"discriminator_value\"\n"
+      "        proxy=3D\"ProxyInterface\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        dynamic-update=3D\"true|false\"\n"
+      "        dynamic-insert=3D\"true|false\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        node=3D\"element-name\"\n"
+      "        extends=3D\"SuperclassName\">\n"
+      "\n"
+      "        <property .... />\n"
+      "        .....\n"
+      "</subclass>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
+#, no-c-format
 msgid "<literal>name</literal>: The fully qualified class name of the subc=
lass."
 msgstr ""
 =

-#: basic_mapping.xml:2350(para) =

+#. Tag: para
+#: basic_mapping.xml:2052
+#, no-c-format
 msgid "<literal>discriminator-value</literal> (optional - defaults to the =
class name): A value that distiguishes individual subclasses."
 msgstr ""
 =

-#: basic_mapping.xml:2356(para) basic_mapping.xml:2432(para) basic_mapping=
.xml:2543(para) =

+#. Tag: para
+#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
+#, no-c-format
 msgid "<literal>proxy</literal> (optional): Specifies a class or interface=
 to use for lazy initializing proxies."
 msgstr ""
 =

-#: basic_mapping.xml:2362(para) basic_mapping.xml:2438(para) basic_mapping=
.xml:2549(para) =

+#. Tag: para
+#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
+#, no-c-format
 msgid "<literal>lazy</literal> (optional, defaults to <literal>true</liter=
al>): Setting <literal>lazy=3D\"false\"</literal> disables the use of lazy =
fetching."
 msgstr ""
 =

-#: basic_mapping.xml:2370(para) =

+#. Tag: para
+#: basic_mapping.xml:2072
+#, no-c-format
 msgid "Each subclass should declare its own persistent properties and subc=
lasses. <literal>&lt;version&gt;</literal> and <literal>&lt;id&gt;</literal=
> properties are assumed to be inherited from the root class. Each subclass=
 in a heirarchy must define a unique <literal>discriminator-value</literal>=
. If none is specified, the fully qualified Java class name is used."
 msgstr ""
 =

-#: basic_mapping.xml:2378(para) basic_mapping.xml:2485(para) basic_mapping=
.xml:2561(para) =

+#. Tag: para
+#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
+#, no-c-format
 msgid "For information about inheritance mappings, see <xref linkend=3D\"i=
nheritance\"/>."
 msgstr ""
 =

-#: basic_mapping.xml:2385(title) =

+#. Tag: title
+#: basic_mapping.xml:2087
+#, no-c-format
 msgid "joined-subclass"
 msgstr ""
 =

-#: basic_mapping.xml:2387(para) =

+#. Tag: para
+#: basic_mapping.xml:2089
+#, no-c-format
 msgid "Alternatively, each subclass may be mapped to its own table (table-=
per-subclass mapping strategy). Inherited state is retrieved by joining wit=
h the table of the superclass. We use the <literal>&lt;joined-subclass&gt;<=
/literal> element."
 msgstr ""
 =

-#: basic_mapping.xml:2427(para) basic_mapping.xml:2538(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2102
+#, no-c-format
+msgid ""
+      "<![CDATA[<joined-subclass\n"
+      "        name=3D\"ClassName\"\n"
+      "        table=3D\"tablename\"\n"
+      "        proxy=3D\"ProxyInterface\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        dynamic-update=3D\"true|false\"\n"
+      "        dynamic-insert=3D\"true|false\"\n"
+      "        schema=3D\"schema\"\n"
+      "        catalog=3D\"catalog\"\n"
+      "        extends=3D\"SuperclassName\"\n"
+      "        persister=3D\"ClassName\"\n"
+      "        subselect=3D\"SQL expression\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        node=3D\"element-name\">\n"
+      "\n"
+      "        <key .... >\n"
+      "\n"
+      "        <property .... />\n"
+      "        .....\n"
+      "</joined-subclass>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2110 basic_mapping.xml:2173
+#, no-c-format
 msgid "<literal>table</literal>: The name of the subclass table."
 msgstr ""
 =

-#: basic_mapping.xml:2446(para) =

+#. Tag: para
+#: basic_mapping.xml:2129
+#, no-c-format
 msgid "No discriminator column is required for this mapping strategy. Each=
 subclass must, however, declare a table column holding the object identifi=
er using the <literal>&lt;key&gt;</literal> element. The mapping at the sta=
rt of the chapter would be re-written as:"
 msgstr ""
 =

-#: basic_mapping.xml:2492(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:2136
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "        \"-//Hibernate/Hibernate Mapping DTD//EN\"\n"
+      "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dt=
d\">\n"
+      "\n"
+      "<hibernate-mapping package=3D\"eg\">\n"
+      "\n"
+      "        <class name=3D\"Cat\" table=3D\"CATS\">\n"
+      "                <id name=3D\"id\" column=3D\"uid\" type=3D\"long\">=
\n"
+      "                        <generator class=3D\"hilo\"/>\n"
+      "                </id>\n"
+      "                <property name=3D\"birthdate\" type=3D\"date\"/>\n"
+      "                <property name=3D\"color\" not-null=3D\"true\"/>\n"
+      "                <property name=3D\"sex\" not-null=3D\"true\"/>\n"
+      "                <property name=3D\"weight\"/>\n"
+      "                <many-to-one name=3D\"mate\"/>\n"
+      "                <set name=3D\"kittens\">\n"
+      "                        <key column=3D\"MOTHER\"/>\n"
+      "                        <one-to-many class=3D\"Cat\"/>\n"
+      "                </set>\n"
+      "                <joined-subclass name=3D\"DomesticCat\" table=3D\"D=
OMESTIC_CATS\">\n"
+      "                    <key column=3D\"CAT\"/>\n"
+      "                    <property name=3D\"name\" type=3D\"string\"/>\n"
+      "                </joined-subclass>\n"
+      "        </class>\n"
+      "\n"
+      "        <class name=3D\"eg.Dog\">\n"
+      "                <!-- mapping for Dog could go here -->\n"
+      "        </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:2145
+#, no-c-format
 msgid "union-subclass"
 msgstr ""
 =

-#: basic_mapping.xml:2494(para) =

+#. Tag: para
+#: basic_mapping.xml:2147
+#, no-c-format
 msgid "A third option is to map only the concrete classes of an inheritanc=
e hierarchy to tables, (the table-per-concrete-class strategy) where each t=
able defines all persistent state of the class, including inherited state. =
In Hibernate, it is not absolutely necessary to explicitly map such inherit=
ance hierarchies. You can simply map each class with a separate <literal>&l=
t;class&gt;</literal> declaration. However, if you wish use polymorphic ass=
ociations (e.g. an association to the superclass of your hierarchy), you ne=
ed to use the <literal>&lt;union-subclass&gt;</literal> mapping."
 msgstr ""
 =

-#: basic_mapping.xml:2557(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2165
+#, no-c-format
+msgid ""
+      "<![CDATA[<union-subclass\n"
+      "        name=3D\"ClassName\"\n"
+      "        table=3D\"tablename\"\n"
+      "        proxy=3D\"ProxyInterface\"\n"
+      "        lazy=3D\"true|false\"\n"
+      "        dynamic-update=3D\"true|false\"\n"
+      "        dynamic-insert=3D\"true|false\"\n"
+      "        schema=3D\"schema\"\n"
+      "        catalog=3D\"catalog\"\n"
+      "        extends=3D\"SuperclassName\"\n"
+      "        abstract=3D\"true|false\"\n"
+      "        persister=3D\"ClassName\"\n"
+      "        subselect=3D\"SQL expression\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        node=3D\"element-name\">\n"
+      "\n"
+      "        <property .... />\n"
+      "        .....\n"
+      "</union-subclass>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2192
+#, no-c-format
 msgid "No discriminator column or key column is required for this mapping =
strategy."
 msgstr ""
 =

-#: basic_mapping.xml:2568(title) =

+#. Tag: title
+#: basic_mapping.xml:2203
+#, no-c-format
 msgid "join"
 msgstr ""
 =

-#: basic_mapping.xml:2570(para) =

+#. Tag: para
+#: basic_mapping.xml:2205
+#, no-c-format
 msgid "Using the <literal>&lt;join&gt;</literal> element, it is possible t=
o map properties of one class to several tables, when there's a 1-to-1 rela=
tionship between the tables."
 msgstr ""
 =

-#: basic_mapping.xml:2600(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2219
+#, no-c-format
+msgid ""
+      "<![CDATA[<join\n"
+      "        table=3D\"tablename\"\n"
+      "        schema=3D\"owner\"\n"
+      "        catalog=3D\"catalog\"\n"
+      "        fetch=3D\"join|select\"\n"
+      "        inverse=3D\"true|false\"\n"
+      "        optional=3D\"true|false\">\n"
+      "\n"
+      "        <key ... />\n"
+      "\n"
+      "        <property ... />\n"
+      "        ...\n"
+      "</join>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2223
+#, no-c-format
 msgid "<literal>table</literal>: The name of the joined table."
 msgstr ""
 =

-#: basic_mapping.xml:2617(para) =

+#. Tag: para
+#: basic_mapping.xml:2240
+#, no-c-format
 msgid "<literal>fetch</literal> (optional - defaults to <literal>join</lit=
eral>): If set to <literal>join</literal>, the default, Hibernate will use =
an inner join to retrieve a <literal>&lt;join&gt;</literal> defined by a cl=
ass or its superclasses and an outer join for a <literal>&lt;join&gt;</lite=
ral> defined by a subclass. If set to <literal>select</literal> then Hibern=
ate will use a sequential select for a <literal>&lt;join&gt;</literal> defi=
ned on a subclass, which will be issued only if a row turns out to represen=
t an instance of the subclass. Inner joins will still be used to retrieve a=
 <literal>&lt;join&gt;</literal> defined by the class and its superclasses."
 msgstr ""
 =

-#: basic_mapping.xml:2630(para) =

+#. Tag: para
+#: basic_mapping.xml:2253
+#, no-c-format
 msgid "<literal>inverse</literal> (optional - defaults to <literal>false</=
literal>): If enabled, Hibernate will not try to insert or update the prope=
rties defined by this join."
 msgstr ""
 =

-#: basic_mapping.xml:2637(para) =

+#. Tag: para
+#: basic_mapping.xml:2260
+#, no-c-format
 msgid "<literal>optional</literal> (optional - defaults to <literal>false<=
/literal>): If enabled, Hibernate will insert a row only if the properties =
defined by this join are non-null and will always use an outer join to retr=
ieve the properties."
 msgstr ""
 =

-#: basic_mapping.xml:2646(para) =

+#. Tag: para
+#: basic_mapping.xml:2269
+#, no-c-format
 msgid "For example, the address information for a person can be mapped to =
a separate table (while preserving value type semantics for all properties)=
:"
 msgstr ""
 =

-#: basic_mapping.xml:2664(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2274
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\"\n"
+      "    table=3D\"PERSON\">\n"
+      "\n"
+      "    <id name=3D\"id\" column=3D\"PERSON_ID\">...</id>\n"
+      "\n"
+      "    <join table=3D\"ADDRESS\">\n"
+      "        <key column=3D\"ADDRESS_ID\"/>\n"
+      "        <property name=3D\"address\"/>\n"
+      "        <property name=3D\"zip\"/>\n"
+      "        <property name=3D\"country\"/>\n"
+      "    </join>\n"
+      "    ...]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2276
+#, no-c-format
 msgid "This feature is often only useful for legacy data models, we recomm=
end fewer tables than classes and a fine-grained domain model. However, it =
is useful for switching between inheritance mapping strategies in a single =
hierarchy, as explained later."
 msgstr ""
 =

-#: basic_mapping.xml:2674(title) =

-msgid "key"
+#. Tag: title
+#: basic_mapping.xml:2286
+#, no-c-format
+msgid "<title>key</title>"
 msgstr ""
 =

-#: basic_mapping.xml:2676(para) =

+#. Tag: para
+#: basic_mapping.xml:2288
+#, no-c-format
 msgid "We've seen the <literal>&lt;key&gt;</literal> element crop up a few=
 times now. It appears anywhere the parent mapping element defines a join t=
o a new table, and defines the foreign key in the joined table, that refere=
nces the primary key of the original table."
 msgstr ""
 =

-#: basic_mapping.xml:2710(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2304
+#, no-c-format
+msgid ""
+      "<![CDATA[<key\n"
+      "        column=3D\"columnname\"\n"
+      "        on-delete=3D\"noaction|cascade\"\n"
+      "        property-ref=3D\"propertyName\"\n"
+      "        not-null=3D\"true|false\"\n"
+      "        update=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2315
+#, no-c-format
 msgid "<literal>on-delete</literal> (optional, defaults to <literal>noacti=
on</literal>): Specifies whether the foreign key constraint has database-le=
vel cascade delete enabled."
 msgstr ""
 =

-#: basic_mapping.xml:2717(para) =

+#. Tag: para
+#: basic_mapping.xml:2322
+#, no-c-format
 msgid "<literal>property-ref</literal> (optional): Specifies that the fore=
ign key refers to columns that are not the primary key of the orginal table=
. (Provided for legacy data.)"
 msgstr ""
 =

-#: basic_mapping.xml:2724(para) =

+#. Tag: para
+#: basic_mapping.xml:2329
+#, no-c-format
 msgid "<literal>not-null</literal> (optional): Specifies that the foreign =
key columns are not nullable (this is implied whenever the foreign key is a=
lso part of the primary key)."
 msgstr ""
 =

-#: basic_mapping.xml:2731(para) =

+#. Tag: para
+#: basic_mapping.xml:2336
+#, no-c-format
 msgid "<literal>update</literal> (optional): Specifies that the foreign ke=
y should never be updated (this is implied whenever the foreign key is also=
 part of the primary key)."
 msgstr ""
 =

-#: basic_mapping.xml:2738(para) =

+#. Tag: para
+#: basic_mapping.xml:2343
+#, no-c-format
 msgid "<literal>unique</literal> (optional): Specifies that the foreign ke=
y should have a unique constraint (this is implied whenever the foreign key=
 is also the primary key)."
 msgstr ""
 =

-#: basic_mapping.xml:2746(para) =

+#. Tag: para
+#: basic_mapping.xml:2351
+#, no-c-format
 msgid "We recommend that for systems where delete performance is important=
, all keys should be defined <literal>on-delete=3D\"cascade\"</literal>, an=
d Hibernate will use a database-level <literal>ON CASCADE DELETE</literal> =
constraint, instead of many individual <literal>DELETE</literal> statements=
. Be aware that this feature bypasses Hibernate's usual optimistic locking =
strategy for versioned data."
 msgstr ""
 =

-#: basic_mapping.xml:2754(para) =

+#. Tag: para
+#: basic_mapping.xml:2359
+#, no-c-format
 msgid "The <literal>not-null</literal> and <literal>update</literal> attri=
butes are useful when mapping a unidirectional one to many association. If =
you map a unidirectional one to many to a non-nullable foreign key, you <em=
phasis>must</emphasis> declare the key column using <literal>&lt;key not-nu=
ll=3D\"true\"&gt;</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:2764(title) =

+#. Tag: title
+#: basic_mapping.xml:2369
+#, no-c-format
 msgid "column and formula elements"
 msgstr ""
 =

-#: basic_mapping.xml:2765(para) =

+#. Tag: para
+#: basic_mapping.xml:2370
+#, no-c-format
 msgid "Any mapping element which accepts a <literal>column</literal> attri=
bute will alternatively accept a <literal>&lt;column&gt;</literal> subeleme=
nt. Likewise, <literal>&lt;formula&gt;</literal> is an alternative to the <=
literal>formula</literal> attribute."
 msgstr ""
 =

-#: basic_mapping.xml:2786(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2376
+#, no-c-format
+msgid ""
+      "<![CDATA[<column\n"
+      "        name=3D\"column_name\"\n"
+      "        length=3D\"N\"\n"
+      "        precision=3D\"N\"\n"
+      "        scale=3D\"N\"\n"
+      "        not-null=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        unique-key=3D\"multicolumn_unique_key_name\"\n"
+      "        index=3D\"index_name\"\n"
+      "        sql-type=3D\"sql_type_name\"\n"
+      "        check=3D\"SQL expression\"\n"
+      "        default=3D\"SQL expression\"/>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:2378
+#, no-c-format
+msgid "<![CDATA[<formula>SQL expression</formula>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2380
+#, no-c-format
 msgid "<literal>column</literal> and <literal>formula</literal> attributes=
 may even be combined within the same property or association mapping to ex=
press, for example, exotic join conditions."
 msgstr ""
 =

-#: basic_mapping.xml:2801(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:2386
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one name=3D\"homeAddress\" class=3D\"Address\"\n"
+      "        insert=3D\"false\" update=3D\"false\">\n"
+      "    <column name=3D\"person_id\" not-null=3D\"true\" length=3D\"10\=
"/>\n"
+      "    <formula>'MAILING'</formula>\n"
+      "</many-to-one>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:2391
+#, no-c-format
 msgid "import"
 msgstr ""
 =

-#: basic_mapping.xml:2803(para) =

+#. Tag: para
+#: basic_mapping.xml:2393
+#, no-c-format
 msgid "Suppose your application has two persistent classes with the same n=
ame, and you don't want to specify the fully qualified (package) name in Hi=
bernate queries. Classes may be \"imported\" explicitly, rather than relyin=
g upon <literal>auto-import=3D\"true\"</literal>. You may even import class=
es and interfaces that are not explicitly mapped."
 msgstr ""
 =

-#: basic_mapping.xml:2823(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2400
+#, no-c-format
+msgid "<![CDATA[<import class=3D\"java.lang.Object\" rename=3D\"Universe\"=
/>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:2407
+#, no-c-format
+msgid ""
+      "<![CDATA[<import\n"
+      "        class=3D\"ClassName\"\n"
+      "        rename=3D\"ShortName\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2410
+#, no-c-format
 msgid "<literal>class</literal>: The fully qualified class name of of any =
Java class."
 msgstr ""
 =

-#: basic_mapping.xml:2828(para) =

+#. Tag: para
+#: basic_mapping.xml:2415
+#, no-c-format
 msgid "<literal>rename</literal> (optional - defaults to the unqualified c=
lass name): A name that may be used in the query language."
 msgstr ""
 =

-#: basic_mapping.xml:2839(title) =

-msgid "any"
+#. Tag: title
+#: basic_mapping.xml:2426
+#, no-c-format
+msgid "<title>any</title>"
 msgstr ""
 =

-#: basic_mapping.xml:2841(para) =

+#. Tag: para
+#: basic_mapping.xml:2428
+#, no-c-format
 msgid "There is one further type of property mapping. The <literal>&lt;any=
&gt;</literal> mapping element defines a polymorphic association to classes=
 from multiple tables. This type of mapping always requires more than one c=
olumn. The first column holds the type of the associated entity. The remain=
ing columns hold the identifier. It is impossible to specify a foreign key =
constraint for this kind of association, so this is most certainly not mean=
t as the usual way of mapping (polymorphic) associations. You should use th=
is only in very special cases (eg. audit logs, user session data, etc)."
 msgstr ""
 =

-#: basic_mapping.xml:2851(para) =

+#. Tag: para
+#: basic_mapping.xml:2438
+#, no-c-format
 msgid "The <literal>meta-type</literal> attribute lets the application spe=
cify a custom type that maps database column values to persistent classes w=
hich have identifier properties of the type specified by <literal>id-type</=
literal>. You must specify the mapping from values of the meta-type to clas=
s names."
 msgstr ""
 =

-#: basic_mapping.xml:2892(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2445
+#, no-c-format
+msgid ""
+      "<![CDATA[<any name=3D\"being\" id-type=3D\"long\" meta-type=3D\"str=
ing\">\n"
+      "    <meta-value value=3D\"TBL_ANIMAL\" class=3D\"Animal\"/>\n"
+      "    <meta-value value=3D\"TBL_HUMAN\" class=3D\"Human\"/>\n"
+      "    <meta-value value=3D\"TBL_ALIEN\" class=3D\"Alien\"/>\n"
+      "    <column name=3D\"table_name\"/>\n"
+      "    <column name=3D\"id\"/>\n"
+      "</any>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:2456
+#, no-c-format
+msgid ""
+      "<![CDATA[<any\n"
+      "        name=3D\"propertyName\"\n"
+      "        id-type=3D\"idtypename\"\n"
+      "        meta-type=3D\"metatypename\"\n"
+      "        cascade=3D\"cascade_style\"\n"
+      "        access=3D\"field|property|ClassName\"\n"
+      "        optimistic-lock=3D\"true|false\"\n"
+      ">\n"
+      "        <meta-value ... />\n"
+      "        <meta-value ... />\n"
+      "        .....\n"
+      "        <column .... />\n"
+      "        <column .... />\n"
+      "        .....\n"
+      "</any>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2459
+#, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr ""
 =

-#: basic_mapping.xml:2897(para) =

+#. Tag: para
+#: basic_mapping.xml:2464
+#, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr ""
 =

-#: basic_mapping.xml:2902(para) =

+#. Tag: para
+#: basic_mapping.xml:2469
+#, no-c-format
 msgid "<literal>meta-type</literal> (optional - defaults to <literal>strin=
g</literal>): Any type that is allowed for a discriminator mapping."
 msgstr ""
 =

-#: basic_mapping.xml:2908(para) =

+#. Tag: para
+#: basic_mapping.xml:2475
+#, no-c-format
 msgid "<literal>cascade</literal> (optional- defaults to <literal>none</li=
teral>): the cascade style."
 msgstr ""
 =

-#: basic_mapping.xml:2920(para) =

+#. Tag: para
+#: basic_mapping.xml:2487
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Specifies that updates to this property do or do not requ=
ire acquisition of the optimistic lock. In other words, define if a version=
 increment should occur if this property is dirty."
 msgstr ""
 =

-#: basic_mapping.xml:2935(title) =

+#. Tag: title
+#: basic_mapping.xml:2502
+#, no-c-format
 msgid "Hibernate Types"
 msgstr ""
 =

-#: basic_mapping.xml:2938(title) =

+#. Tag: title
+#: basic_mapping.xml:2505
+#, no-c-format
 msgid "Entities and values"
 msgstr ""
 =

-#: basic_mapping.xml:2940(para) =

+#. Tag: para
+#: basic_mapping.xml:2507
+#, no-c-format
 msgid "To understand the behaviour of various Java language-level objects =
with respect to the persistence service, we need to classify them into two =
groups:"
 msgstr ""
 =

-#: basic_mapping.xml:2945(para) =

+#. Tag: para
+#: basic_mapping.xml:2512
+#, no-c-format
 msgid "An <emphasis>entity</emphasis> exists independently of any other ob=
jects holding references to the entity. Contrast this with the usual Java m=
odel where an unreferenced object is garbage collected. Entities must be ex=
plicitly saved and deleted (except that saves and deletions may be <emphasi=
s>cascaded</emphasis> from a parent entity to its children). This is differ=
ent from the ODMG model of object persistence by reachablity - and correspo=
nds more closely to how application objects are usually used in large syste=
ms. Entities support circular and shared references. They may also be versi=
oned."
 msgstr ""
 =

-#: basic_mapping.xml:2956(para) =

+#. Tag: para
+#: basic_mapping.xml:2523
+#, no-c-format
 msgid "An entity's persistent state consists of references to other entiti=
es and instances of <emphasis>value</emphasis> types. Values are primitives=
, collections (not what's inside a collection), components and certain immu=
table objects. Unlike entities, values (in particular collections and compo=
nents) <emphasis>are</emphasis> persisted and deleted by reachability. Sinc=
e value objects (and primitives) are persisted and deleted along with their=
 containing entity they may not be independently versioned. Values have no =
independent identity, so they cannot be shared by two entities or collectio=
ns."
 msgstr ""
 =

-#: basic_mapping.xml:2967(para) =

+#. Tag: para
+#: basic_mapping.xml:2534
+#, no-c-format
 msgid "Up until now, we've been using the term \"persistent class\" to ref=
er to entities. We will continue to do that. Strictly speaking, however, no=
t all user-defined classes with persistent state are entities. A <emphasis>=
component</emphasis> is a user defined class with value semantics. A Java p=
roperty of type <literal>java.lang.String</literal> also has value semantic=
s. Given this definition, we can say that all types (classes) provided by t=
he JDK have value type semantics in Java, while user-defined types may be m=
apped with entity or value type semantics. This decision is up to the appli=
cation developer. A good hint for an entity class in a domain model are sha=
red references to a single instance of that class, while composition or agg=
regation usually translates to a value type."
 msgstr ""
 =

-#: basic_mapping.xml:2981(para) =

+#. Tag: para
+#: basic_mapping.xml:2548
+#, no-c-format
 msgid "We'll revisit both concepts throughout the documentation."
 msgstr ""
 =

-#: basic_mapping.xml:2985(para) =

+#. Tag: para
+#: basic_mapping.xml:2552
+#, no-c-format
 msgid "The challenge is to map the Java type system (and the developers' d=
efinition of entities and value types) to the SQL/database type system. The=
 bridge between both systems is provided by Hibernate: for entities we use =
<literal>&lt;class&gt;</literal>, <literal>&lt;subclass&gt;</literal> and s=
o on. For value types we use <literal>&lt;property&gt;</literal>, <literal>=
&lt;component&gt;</literal>, etc, usually with a <literal>type</literal> at=
tribute. The value of this attribute is the name of a Hibernate <emphasis>m=
apping type</emphasis>. Hibernate provides many mappings (for standard JDK =
value types) out of the box. You can write your own mapping types and imple=
ment your custom conversion strategies as well, as you'll see later."
 msgstr ""
 =

-#: basic_mapping.xml:2998(para) =

+#. Tag: para
+#: basic_mapping.xml:2565
+#, no-c-format
 msgid "All built-in Hibernate types except collections support null semant=
ics."
 msgstr ""
 =

-#: basic_mapping.xml:3005(title) =

+#. Tag: title
+#: basic_mapping.xml:2572
+#, no-c-format
 msgid "Basic value types"
 msgstr ""
 =

-#: basic_mapping.xml:3012(literal) =

+#. Tag: para
+#: basic_mapping.xml:2574
+#, no-c-format
+msgid "The built-in <emphasis>basic mapping types</emphasis> may be roughl=
y categorized into"
+msgstr ""
+
+#. Tag: literal
+#: basic_mapping.xml:2579
+#, no-c-format
 msgid "integer, long, short, float, double, character, byte, boolean, yes_=
no, true_false"
 msgstr ""
 =

-#: basic_mapping.xml:3015(para) =

+#. Tag: para
+#: basic_mapping.xml:2582
+#, no-c-format
 msgid "Type mappings from Java primitives or wrapper classes to appropriat=
e (vendor-specific) SQL column types. <literal>boolean, yes_no</literal> an=
d <literal>true_false</literal> are all alternative encodings for a Java <l=
iteral>boolean</literal> or <literal>java.lang.Boolean</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:3024(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2591
+#, no-c-format
 msgid "string"
 msgstr ""
 =

-#: basic_mapping.xml:3026(para) =

+#. Tag: para
+#: basic_mapping.xml:2593
+#, no-c-format
 msgid "A type mapping from <literal>java.lang.String</literal> to <literal=
>VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>)."
 msgstr ""
 =

-#: basic_mapping.xml:3033(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2600
+#, no-c-format
 msgid "date, time, timestamp"
 msgstr ""
 =

-#: basic_mapping.xml:3035(para) =

+#. Tag: para
+#: basic_mapping.xml:2602
+#, no-c-format
 msgid "Type mappings from <literal>java.util.Date</literal> and its subcla=
sses to SQL types <literal>DATE</literal>, <literal>TIME</literal> and <lit=
eral>TIMESTAMP</literal> (or equivalent)."
 msgstr ""
 =

-#: basic_mapping.xml:3043(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2610
+#, no-c-format
 msgid "calendar, calendar_date"
 msgstr ""
 =

-#: basic_mapping.xml:3045(para) =

+#. Tag: para
+#: basic_mapping.xml:2612
+#, no-c-format
 msgid "Type mappings from <literal>java.util.Calendar</literal> to SQL typ=
es <literal>TIMESTAMP</literal> and <literal>DATE</literal> (or equivalent)=
."
 msgstr ""
 =

-#: basic_mapping.xml:3053(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2620
+#, no-c-format
 msgid "big_decimal, big_integer"
 msgstr ""
 =

-#: basic_mapping.xml:3055(para) =

+#. Tag: para
+#: basic_mapping.xml:2622
+#, no-c-format
 msgid "Type mappings from <literal>java.math.BigDecimal</literal> and <lit=
eral>java.math.BigInteger</literal> to <literal>NUMERIC</literal> (or Oracl=
e <literal>NUMBER</literal>)."
 msgstr ""
 =

-#: basic_mapping.xml:3063(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2630
+#, no-c-format
 msgid "locale, timezone, currency"
 msgstr ""
 =

-#: basic_mapping.xml:3065(para) =

+#. Tag: para
+#: basic_mapping.xml:2632
+#, no-c-format
 msgid "Type mappings from <literal>java.util.Locale</literal>, <literal>ja=
va.util.TimeZone</literal> and <literal>java.util.Currency</literal> to <li=
teral>VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>). Instances =
of <literal>Locale</literal> and <literal>Currency</literal> are mapped to =
their ISO codes. Instances of <literal>TimeZone</literal> are mapped to the=
ir <literal>ID</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:3079(para) =

+#. Tag: literal
+#: basic_mapping.xml:2644
+#, no-c-format
+msgid "<literal>class</literal>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2646
+#, no-c-format
 msgid "A type mapping from <literal>java.lang.Class</literal> to <literal>=
VARCHAR</literal> (or Oracle <literal>VARCHAR2</literal>). A <literal>Class=
</literal> is mapped to its fully qualified name."
 msgstr ""
 =

-#: basic_mapping.xml:3087(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2654
+#, no-c-format
 msgid "binary"
 msgstr ""
 =

-#: basic_mapping.xml:3089(para) =

+#. Tag: para
+#: basic_mapping.xml:2656
+#, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr ""
 =

-#: basic_mapping.xml:3095(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2662
+#, no-c-format
 msgid "text"
 msgstr ""
 =

-#: basic_mapping.xml:3097(para) =

+#. Tag: para
+#: basic_mapping.xml:2664
+#, no-c-format
 msgid "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal=
>TEXT</literal> type."
 msgstr ""
 =

-#: basic_mapping.xml:3104(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2671
+#, no-c-format
 msgid "serializable"
 msgstr ""
 =

-#: basic_mapping.xml:3106(para) =

+#. Tag: para
+#: basic_mapping.xml:2673
+#, no-c-format
 msgid "Maps serializable Java types to an appropriate SQL binary type. You=
 may also indicate the Hibernate type <literal>serializable</literal> with =
the name of a serializable Java class or interface that does not default to=
 a basic type."
 msgstr ""
 =

-#: basic_mapping.xml:3115(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2682
+#, no-c-format
 msgid "clob, blob"
 msgstr ""
 =

-#: basic_mapping.xml:3117(para) =

+#. Tag: para
+#: basic_mapping.xml:2684
+#, no-c-format
 msgid "Type mappings for the JDBC classes <literal>java.sql.Clob</literal>=
 and <literal>java.sql.Blob</literal>. These types may be inconvenient for =
some applications, since the blob or clob object may not be reused outside =
of a transaction. (Furthermore, driver support is patchy and inconsistent.)"
 msgstr ""
 =

-#: basic_mapping.xml:3127(literal) =

+#. Tag: literal
+#: basic_mapping.xml:2694
+#, no-c-format
 msgid "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date,=
 imm_serializable, imm_binary"
 msgstr ""
 =

-#: basic_mapping.xml:3131(para) =

+#. Tag: para
+#: basic_mapping.xml:2698
+#, no-c-format
 msgid "Type mappings for what are usually considered mutable Java types, w=
here Hibernate makes certain optimizations appropriate only for immutable J=
ava types, and the application treats the object as immutable. For example,=
 you should not call <literal>Date.setTime()</literal> for an instance mapp=
ed as <literal>imm_timestamp</literal>. To change the value of the property=
, and have that change made persistent, the application must assign a new (=
nonidentical) object to the property."
 msgstr ""
 =

-#: basic_mapping.xml:3007(para) =

-msgid "The built-in <emphasis>basic mapping types</emphasis> may be roughl=
y categorized into <placeholder-1/>"
-msgstr ""
-
-#: basic_mapping.xml:3146(para) =

+#. Tag: para
+#: basic_mapping.xml:2713
+#, no-c-format
 msgid "Unique identifiers of entities and collections may be of any basic =
type except <literal>binary</literal>, <literal>blob</literal> and <literal=
>clob</literal>. (Composite identifiers are also allowed, see below.)"
 msgstr ""
 =

-#: basic_mapping.xml:3152(para) =

+#. Tag: para
+#: basic_mapping.xml:2719
+#, no-c-format
 msgid "The basic value types have corresponding <literal>Type</literal> co=
nstants defined on <literal>org.hibernate.Hibernate</literal>. For example,=
 <literal>Hibernate.STRING</literal> represents the <literal>string</litera=
l> type."
 msgstr ""
 =

-#: basic_mapping.xml:3161(title) =

+#. Tag: title
+#: basic_mapping.xml:2728
+#, no-c-format
 msgid "Custom value types"
 msgstr ""
 =

-#: basic_mapping.xml:3163(para) =

+#. Tag: para
+#: basic_mapping.xml:2730
+#, no-c-format
 msgid "It is relatively easy for developers to create their own value type=
s. For example, you might want to persist properties of type <literal>java.=
lang.BigInteger</literal> to <literal>VARCHAR</literal> columns. Hibernate =
does not provide a built-in type for this. But custom types are not limited=
 to mapping a property (or collection element) to a single table column. So=
, for example, you might have a Java property <literal>getName()</literal>/=
<literal>setName()</literal> of type <literal>java.lang.String</literal> th=
at is persisted to the columns <literal>FIRST_NAME</literal>, <literal>INIT=
IAL</literal>, <literal>SURNAME</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:3174(para) =

+#. Tag: para
+#: basic_mapping.xml:2741
+#, no-c-format
 msgid "To implement a custom type, implement either <literal>org.hibernate=
.UserType</literal> or <literal>org.hibernate.CompositeUserType</literal> a=
nd declare properties using the fully qualified classname of the type. Chec=
k out <literal>org.hibernate.test.DoubleStringType</literal> to see the kin=
d of things that are possible."
 msgstr ""
 =

-#: basic_mapping.xml:3187(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2749
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"twoStrings\" type=3D\"org.hibernate.tes=
t.DoubleStringType\">\n"
+      "    <column name=3D\"first_string\"/>\n"
+      "    <column name=3D\"second_string\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2751
+#, no-c-format
 msgid "Notice the use of <literal>&lt;column&gt;</literal> tags to map a p=
roperty to multiple columns."
 msgstr ""
 =

-#: basic_mapping.xml:3192(para) =

+#. Tag: para
+#: basic_mapping.xml:2756
+#, no-c-format
 msgid "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType=
</literal>, <literal>UserCollectionType</literal>, and <literal>UserVersion=
Type</literal> interfaces provide support for more specialized uses."
 msgstr ""
 =

-#: basic_mapping.xml:3198(para) =

+#. Tag: para
+#: basic_mapping.xml:2762
+#, no-c-format
 msgid "You may even supply parameters to a <literal>UserType</literal> in =
the mapping file. To do this, your <literal>UserType</literal> must impleme=
nt the <literal>org.hibernate.usertype.ParameterizedType</literal> interfac=
e. To supply parameters to your custom type, you can use the <literal>&lt;t=
ype&gt;</literal> element in your mapping files."
 msgstr ""
 =

-#: basic_mapping.xml:3212(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2770
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"priority\">\n"
+      "    <type name=3D\"com.mycompany.usertypes.DefaultValueIntegerType\=
">\n"
+      "        <param name=3D\"default\">0</param>\n"
+      "    </type>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2772
+#, no-c-format
 msgid "The <literal>UserType</literal> can now retrieve the value for the =
parameter named <literal>default</literal> from the <literal>Properties</li=
teral> object passed to it."
 msgstr ""
 =

-#: basic_mapping.xml:3217(para) =

+#. Tag: para
+#: basic_mapping.xml:2777
+#, no-c-format
 msgid "If you use a certain <literal>UserType</literal> very often, it may=
 be useful to define a shorter name for it. You can do this using the <lite=
ral>&lt;typedef&gt;</literal> element. Typedefs assign a name to a custom t=
ype, and may also contain a list of default parameter values if the type is=
 parameterized."
 msgstr ""
 =

-#: basic_mapping.xml:3230(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2784
+#, no-c-format
+msgid ""
+      "<![CDATA[<typedef class=3D\"com.mycompany.usertypes.DefaultValueInt=
egerType\" name=3D\"default_zero\">\n"
+      "    <param name=3D\"default\">0</param>\n"
+      "</typedef>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: basic_mapping.xml:2786
+#, no-c-format
+msgid "<![CDATA[<property name=3D\"priority\" type=3D\"default_zero\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2788
+#, no-c-format
 msgid "It is also possible to override the parameters supplied in a typede=
f on a case-by-case basis by using type parameters on the property mapping."
 msgstr ""
 =

-#: basic_mapping.xml:3235(para) =

+#. Tag: para
+#: basic_mapping.xml:2793
+#, no-c-format
 msgid "Even though Hibernate's rich range of built-in types and support fo=
r components means you will very rarely <emphasis>need</emphasis> to use a =
custom type, it is nevertheless considered good form to use custom types fo=
r (non-entity) classes that occur frequently in your application. For examp=
le, a <literal>MonetaryAmount</literal> class is a good candidate for a <li=
teral>CompositeUserType</literal>, even though it could easily be mapped as=
 a component. One motivation for this is abstraction. With a custom type, y=
our mapping documents would be future-proofed against possible changes in y=
our way of representing monetary values."
 msgstr ""
 =

-#: basic_mapping.xml:3251(title) =

+#. Tag: title
+#: basic_mapping.xml:2809
+#, no-c-format
 msgid "Mapping a class more than once"
 msgstr ""
 =

-#: basic_mapping.xml:3252(para) =

+#. Tag: para
+#: basic_mapping.xml:2810
+#, no-c-format
 msgid "It is possible to provide more than one mapping for a particular pe=
rsistent class. In this case you must specify an <emphasis>entity name</emp=
hasis> do disambiguate between instances of the two mapped entities. (By de=
fault, the entity name is the same as the class name.) Hibernate lets you s=
pecify the entity name when working with persistent objects, when writing q=
ueries, or when mapping associations to the named entity."
 msgstr ""
 =

-#: basic_mapping.xml:3278(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2818
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Contract\" table=3D\"Contracts\"\n"
+      "        entity-name=3D\"CurrentContract\">\n"
+      "    ...\n"
+      "    <set name=3D\"history\" inverse=3D\"true\"\n"
+      "            order-by=3D\"effectiveEndDate desc\">\n"
+      "        <key column=3D\"currentContractId\"/>\n"
+      "        <one-to-many entity-name=3D\"HistoricalContract\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Contract\" table=3D\"ContractHistory\"\n"
+      "        entity-name=3D\"HistoricalContract\">\n"
+      "    ...\n"
+      "    <many-to-one name=3D\"currentContract\"\n"
+      "            column=3D\"currentContractId\"\n"
+      "            entity-name=3D\"CurrentContract\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2820
+#, no-c-format
 msgid "Notice how associations are now specified using <literal>entity-nam=
e</literal> instead of <literal>class</literal>."
 msgstr ""
 =

-#: basic_mapping.xml:3286(title) =

+#. Tag: title
+#: basic_mapping.xml:2828
+#, no-c-format
 msgid "SQL quoted identifiers"
 msgstr ""
 =

-#: basic_mapping.xml:3287(para) =

+#. Tag: para
+#: basic_mapping.xml:2829
+#, no-c-format
 msgid "You may force Hibernate to quote an identifier in the generated SQL=
 by enclosing the table or column name in backticks in the mapping document=
. Hibernate will use the correct quotation style for the SQL <literal>Diale=
ct</literal> (usually double quotes, but brackets for SQL Server and backti=
cks for MySQL)."
 msgstr ""
 =

-#: basic_mapping.xml:3304(title) =

+#. Tag: programlisting
+#: basic_mapping.xml:2836
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"LineItem\" table=3D\"`Line Item`\">\n"
+      "    <id name=3D\"id\" column=3D\"`Item Id`\"/><generator class=3D\"=
assigned\"/></id>\n"
+      "    <property name=3D\"itemNumber\" column=3D\"`Item #`\"/>\n"
+      "    ...\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: basic_mapping.xml:2842
+#, no-c-format
 msgid "Metadata alternatives"
 msgstr ""
 =

-#: basic_mapping.xml:3306(para) =

+#. Tag: para
+#: basic_mapping.xml:2844
+#, no-c-format
 msgid "XML isn't for everyone, and so there are some alternative ways to d=
efine O/R mapping metadata in Hibernate."
 msgstr ""
 =

-#: basic_mapping.xml:3311(title) =

+#. Tag: title
+#: basic_mapping.xml:2849
+#, no-c-format
 msgid "Using XDoclet markup"
 msgstr ""
 =

-#: basic_mapping.xml:3313(para) =

+#. Tag: para
+#: basic_mapping.xml:2851
+#, no-c-format
 msgid "Many Hibernate users prefer to embed mapping information directly i=
n sourcecode using XDoclet <literal>@hibernate.tags</literal>. We will not =
cover this approach in this document, since strictly it is considered part =
of XDoclet. However, we include the following example of the <literal>Cat</=
literal> class with XDoclet mappings."
 msgstr ""
 =

-#: basic_mapping.xml:3425(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2858
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "import java.util.Set;\n"
+      "import java.util.Date;\n"
+      "\n"
+      "/**\n"
+      " * @hibernate.class\n"
+      " *  table=3D\"CATS\"\n"
+      " */\n"
+      "public class Cat {\n"
+      "    private Long id; // identifier\n"
+      "    private Date birthdate;\n"
+      "    private Cat mother;\n"
+      "    private Set kittens\n"
+      "    private Color color;\n"
+      "    private char sex;\n"
+      "    private float weight;\n"
+      "\n"
+      "    /*\n"
+      "     * @hibernate.id\n"
+      "     *  generator-class=3D\"native\"\n"
+      "     *  column=3D\"CAT_ID\"\n"
+      "     */\n"
+      "    public Long getId() {\n"
+      "        return id;\n"
+      "    }\n"
+      "    private void setId(Long id) {\n"
+      "        this.id=3Did;\n"
+      "    }\n"
+      "\n"
+      "    /**\n"
+      "     * @hibernate.many-to-one\n"
+      "     *  column=3D\"PARENT_ID\"\n"
+      "     */\n"
+      "    public Cat getMother() {\n"
+      "        return mother;\n"
+      "    }\n"
+      "    void setMother(Cat mother) {\n"
+      "        this.mother =3D mother;\n"
+      "    }\n"
+      "\n"
+      "    /**\n"
+      "     * @hibernate.property\n"
+      "     *  column=3D\"BIRTH_DATE\"\n"
+      "     */\n"
+      "    public Date getBirthdate() {\n"
+      "        return birthdate;\n"
+      "    }\n"
+      "    void setBirthdate(Date date) {\n"
+      "        birthdate =3D date;\n"
+      "    }\n"
+      "    /**\n"
+      "     * @hibernate.property\n"
+      "     *  column=3D\"WEIGHT\"\n"
+      "     */\n"
+      "    public float getWeight() {\n"
+      "        return weight;\n"
+      "    }\n"
+      "    void setWeight(float weight) {\n"
+      "        this.weight =3D weight;\n"
+      "    }\n"
+      "\n"
+      "    /**\n"
+      "     * @hibernate.property\n"
+      "     *  column=3D\"COLOR\"\n"
+      "     *  not-null=3D\"true\"\n"
+      "     */\n"
+      "    public Color getColor() {\n"
+      "        return color;\n"
+      "    }\n"
+      "    void setColor(Color color) {\n"
+      "        this.color =3D color;\n"
+      "    }\n"
+      "    /**\n"
+      "     * @hibernate.set\n"
+      "     *  inverse=3D\"true\"\n"
+      "     *  order-by=3D\"BIRTH_DATE\"\n"
+      "     * @hibernate.collection-key\n"
+      "     *  column=3D\"PARENT_ID\"\n"
+      "     * @hibernate.collection-one-to-many\n"
+      "     */\n"
+      "    public Set getKittens() {\n"
+      "        return kittens;\n"
+      "    }\n"
+      "    void setKittens(Set kittens) {\n"
+      "        this.kittens =3D kittens;\n"
+      "    }\n"
+      "    // addKitten not needed by Hibernate\n"
+      "    public void addKitten(Cat kitten) {\n"
+      "        kittens.add(kitten);\n"
+      "    }\n"
+      "\n"
+      "    /**\n"
+      "     * @hibernate.property\n"
+      "     *  column=3D\"SEX\"\n"
+      "     *  not-null=3D\"true\"\n"
+      "     *  update=3D\"false\"\n"
+      "     */\n"
+      "    public char getSex() {\n"
+      "        return sex;\n"
+      "    }\n"
+      "    void setSex(char sex) {\n"
+      "        this.sex=3Dsex;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2860
+#, no-c-format
 msgid "See the Hibernate web site for more examples of XDoclet and Hiberna=
te."
 msgstr ""
 =

-#: basic_mapping.xml:3432(title) =

+#. Tag: title
+#: basic_mapping.xml:2867
+#, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr ""
 =

-#: basic_mapping.xml:3434(para) =

+#. Tag: para
+#: basic_mapping.xml:2869
+#, no-c-format
 msgid "JDK 5.0 introduced XDoclet-style annotations at the language level,=
 type-safe and checked at compile time. This mechnism is more powerful than=
 XDoclet annotations and better supported by tools and IDEs. IntelliJ IDEA,=
 for example, supports auto-completion and syntax highlighting of JDK 5.0 a=
nnotations. The new revision of the EJB specification (JSR-220) uses JDK 5.=
0 annotations as the primary metadata mechanism for entity beans. Hibernate=
3 implements the <literal>EntityManager</literal> of JSR-220 (the persisten=
ce API), support for mapping metadata is available via the <emphasis>Hibern=
ate Annotations</emphasis> package, as a separate download. Both EJB3 (JSR-=
220) and Hibernate3 metadata is supported."
 msgstr ""
 =

-#: basic_mapping.xml:3445(para) =

+#. Tag: para
+#: basic_mapping.xml:2880
+#, no-c-format
 msgid "This is an example of a POJO class annotated as an EJB entity bean:"
 msgstr ""
 =

-#: basic_mapping.xml:3472(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2884
+#, no-c-format
+msgid ""
+      "<![CDATA[@Entity(access =3D AccessType.FIELD)\n"
+      "public class Customer implements Serializable {\n"
+      "\n"
+      "    @Id;\n"
+      "    Long id;\n"
+      "\n"
+      "    String firstName;\n"
+      "    String lastName;\n"
+      "    Date birthday;\n"
+      "\n"
+      "    @Transient\n"
+      "    Integer age;\n"
+      "\n"
+      "    @Embedded\n"
+      "    private Address homeAddress;\n"
+      "\n"
+      "    @OneToMany(cascade=3DCascadeType.ALL)\n"
+      "    @JoinColumn(name=3D\"CUSTOMER_ID\")\n"
+      "    Set<Order> orders;\n"
+      "\n"
+      "    // Getter/setter and business methods\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2886
+#, no-c-format
 msgid "Note that support for JDK 5.0 Annotations (and JSR-220) is still wo=
rk in progress and not completed. Please refer to the Hibernate Annotations=
 module for more details."
 msgstr ""
 =

-#: basic_mapping.xml:3481(title) =

+#. Tag: title
+#: basic_mapping.xml:2895
+#, no-c-format
 msgid "Generated Properties"
 msgstr ""
 =

-#: basic_mapping.xml:3482(para) =

+#. Tag: para
+#: basic_mapping.xml:2896
+#, no-c-format
 msgid "Generated properties are properties which have their values generat=
ed by the database. Typically, Hibernate applications needed to <literal>re=
fresh</literal> objects which contain any properties for which the database=
 was generating values. Marking properties as generated, however, lets the =
application delegate this responsibility to Hibernate. Essentially, wheneve=
r Hibernate issues an SQL INSERT or UPDATE for an entity which has defined =
generated properties, it immediately issues a select afterwards to retrieve=
 the generated values."
 msgstr ""
 =

-#: basic_mapping.xml:3491(para) =

-msgid "Properties marked as generated must additionally be non-insertable =
and non-updateable. Only <xref linkend=3D\"mapping-declaration-version\">ve=
rsions</xref>, <xref linkend=3D\"mapping-declaration-timestamp\">timestamps=
</xref>, and <xref linkend=3D\"mapping-declaration-property\">simple proper=
ties</xref> can be marked as generated."
+#. Tag: para
+#: basic_mapping.xml:2905
+#, no-c-format
+msgid "Properties marked as generated must additionally be non-insertable =
and non-updateable. Only <link linkend=3D\"mapping-declaration-version\">ve=
rsions</link>, <link linkend=3D\"mapping-declaration-timestamp\">timestamps=
</link>, and <link linkend=3D\"mapping-declaration-property\">simple proper=
ties</link> can be marked as generated."
 msgstr ""
 =

-#: basic_mapping.xml:3498(para) =

+#. Tag: para
+#: basic_mapping.xml:2912
+#, no-c-format
 msgid "<literal>never</literal> (the default) - means that the given prope=
rty value is not generated within the database."
 msgstr ""
 =

-#: basic_mapping.xml:3502(para) =

-msgid "<literal>insert</literal> - states that the given property value is=
 generated on insert, but is not regenerated on subsequent updates. Things =
like created-date would fall into this category. Note that even thought <xr=
ef linkend=3D\"mapping-declaration-version\">version</xref> and <xref linke=
nd=3D\"mapping-declaration-timestamp\">timestamp</xref> properties can be m=
arked as generated, this option is not available there..."
+#. Tag: para
+#: basic_mapping.xml:2916
+#, no-c-format
+msgid "<literal>insert</literal> - states that the given property value is=
 generated on insert, but is not regenerated on subsequent updates. Things =
like created-date would fall into this category. Note that even thought <li=
nk linkend=3D\"mapping-declaration-version\">version</link> and <link linke=
nd=3D\"mapping-declaration-timestamp\">timestamp</link> properties can be m=
arked as generated, this option is not available there..."
 msgstr ""
 =

-#: basic_mapping.xml:3510(para) =

+#. Tag: para
+#: basic_mapping.xml:2924
+#, no-c-format
 msgid "<literal>always</literal> - states that the property value is gener=
ated both on insert and on update."
 msgstr ""
 =

-#: basic_mapping.xml:3517(title) =

+#. Tag: title
+#: basic_mapping.xml:2931
+#, no-c-format
 msgid "Auxiliary Database Objects"
 msgstr ""
 =

-#: basic_mapping.xml:3518(para) =

+#. Tag: para
+#: basic_mapping.xml:2932
+#, no-c-format
 msgid "Allows CREATE and DROP of arbitrary database objects, in conjunctio=
n with Hibernate's schema evolution tools, to provide the ability to fully =
define a user schema within the Hibernate mapping files. Although designed =
specifically for creating and dropping things like triggers or stored proce=
dures, really any SQL command that can be run via a <literal>java.sql.State=
ment.execute()</literal> method is valid here (ALTERs, INSERTS, etc). There=
 are essentially two modes for defining auxiliary database objects..."
 msgstr ""
 =

-#: basic_mapping.xml:3527(para) =

+#. Tag: para
+#: basic_mapping.xml:2941
+#, no-c-format
 msgid "The first mode is to explicitly list the CREATE and DROP commands o=
ut in the mapping file:"
 msgstr ""
 =

-#: basic_mapping.xml:3538(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2945
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "    ...\n"
+      "    <database-object>\n"
+      "        <create>CREATE TRIGGER my_trigger ...</create>\n"
+      "        <drop>DROP TRIGGER my_trigger</drop>\n"
+      "    </database-object>\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2946
+#, no-c-format
 msgid "The second mode is to supply a custom class which knows how to cons=
truct the CREATE and DROP commands. This custom class must implement the <l=
iteral>org.hibernate.mapping.AuxiliaryDatabaseObject</literal> interface."
 msgstr ""
 =

-#: basic_mapping.xml:3549(para) =

+#. Tag: programlisting
+#: basic_mapping.xml:2951
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "    ...\n"
+      "    <database-object>\n"
+      "        <definition class=3D\"MyTriggerDefinition\"/>\n"
+      "    </database-object>\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: basic_mapping.xml:2952
+#, no-c-format
 msgid "Additionally, these database objects can be optionally scoped such =
that they only apply when certain dialects are used."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: basic_mapping.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: basic_mapping.xml:2956
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "    ...\n"
+      "    <database-object>\n"
+      "        <definition class=3D\"MyTriggerDefinition\"/>\n"
+      "        <dialect-scope name=3D\"org.hibernate.dialect.Oracle9Dialec=
t\"/>\n"
+      "        <dialect-scope name=3D\"org.hibernate.dialect.OracleDialect=
\"/>\n"
+      "    </database-object>\n"
+      "</hibernate-mapping>]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/batc=
h.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	=
2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	=
2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,152 +1,373 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:29-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: batch.xml:5(title) =

+#. Tag: title
+#: batch.xml:29
+#, no-c-format
 msgid "Batch processing"
 msgstr ""
 =

-#: batch.xml:7(para) =

+#. Tag: para
+#: batch.xml:31
+#, no-c-format
 msgid "A naive approach to inserting 100 000 rows in the database using Hi=
bernate might look like this:"
 msgstr ""
 =

-#: batch.xml:21(para) =

+#. Tag: programlisting
+#: batch.xml:36
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "for ( int i=3D0; i<100000; i++ ) {\n"
+      "    Customer customer =3D new Customer(.....);\n"
+      "    session.save(customer);\n"
+      "}\n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:38
+#, no-c-format
 msgid "This would fall over with an <literal>OutOfMemoryException</literal=
> somewhere around the 50 000th row. That's because Hibernate caches all th=
e newly inserted <literal>Customer</literal> instances in the session-level=
 cache."
 msgstr ""
 =

-#: batch.xml:27(para) =

+#. Tag: para
+#: batch.xml:44
+#, no-c-format
 msgid "In this chapter we'll show you how to avoid this problem. First, ho=
wever, if you are doing batch processing, it is absolutely critical that yo=
u enable the use of JDBC batching, if you intend to achieve reasonable perf=
ormance. Set the JDBC batch size to a reasonable number (say, 10-50):"
 msgstr ""
 =

-#: batch.xml:36(para) =

+#. Tag: programlisting
+#: batch.xml:51
+#, no-c-format
+msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:53
+#, no-c-format
 msgid "Note that Hibernate disables insert batching at the JDBC level tran=
sparently if you use an <literal>identiy</literal> identifier generator."
 msgstr ""
 =

-#: batch.xml:41(para) =

+#. Tag: para
+#: batch.xml:58
+#, no-c-format
 msgid "You also might like to do this kind of work in a process where inte=
raction with the second-level cache is completely disabled:"
 msgstr ""
 =

-#: batch.xml:48(para) =

+#. Tag: programlisting
+#: batch.xml:63
+#, no-c-format
+msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:65
+#, no-c-format
 msgid "However, this is not absolutely necessary, since we can explicitly =
set the <literal>CacheMode</literal> to disable interaction with the second=
-level cache."
 msgstr ""
 =

-#: batch.xml:54(title) =

+#. Tag: title
+#: batch.xml:71
+#, no-c-format
 msgid "Batch inserts"
 msgstr ""
 =

-#: batch.xml:56(para) =

+#. Tag: para
+#: batch.xml:73
+#, no-c-format
 msgid "When making new objects persistent, you must <literal>flush()</lite=
ral> and then <literal>clear()</literal> the session regularly, to control =
the size of the first-level cache."
 msgstr ""
 =

-#: batch.xml:81(title) =

+#. Tag: programlisting
+#: batch.xml:79
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "   \n"
+      "for ( int i=3D0; i<100000; i++ ) {\n"
+      "    Customer customer =3D new Customer(.....);\n"
+      "    session.save(customer);\n"
+      "    if ( i % 20 =3D=3D 0 ) { //20, same as the JDBC batch size\n"
+      "        //flush a batch of inserts and release memory:\n"
+      "        session.flush();\n"
+      "        session.clear();\n"
+      "    }\n"
+      "}\n"
+      "   \n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: title
+#: batch.xml:84
+#, no-c-format
 msgid "Batch updates"
 msgstr ""
 =

-#: batch.xml:83(para) =

+#. Tag: para
+#: batch.xml:86
+#, no-c-format
 msgid "For retrieving and updating data the same ideas apply. In addition,=
 you need to use <literal>scroll()</literal> to take advantage of server-si=
de cursors for queries that return many rows of data."
 msgstr ""
 =

-#: batch.xml:112(title) =

+#. Tag: programlisting
+#: batch.xml:92
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "   \n"
+      "ScrollableResults customers =3D session.getNamedQuery(\"GetCustomer=
s\")\n"
+      "    .setCacheMode(CacheMode.IGNORE)\n"
+      "    .scroll(ScrollMode.FORWARD_ONLY);\n"
+      "int count=3D0;\n"
+      "while ( customers.next() ) {\n"
+      "    Customer customer =3D (Customer) customers.get(0);\n"
+      "    customer.updateStuff(...);\n"
+      "    if ( ++count % 20 =3D=3D 0 ) {\n"
+      "        //flush a batch of updates and release memory:\n"
+      "        session.flush();\n"
+      "        session.clear();\n"
+      "    }\n"
+      "}\n"
+      "   \n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: title
+#: batch.xml:97
+#, no-c-format
 msgid "The StatelessSession interface"
 msgstr ""
 =

-#: batch.xml:113(para) =

+#. Tag: para
+#: batch.xml:98
+#, no-c-format
 msgid "Alternatively, Hibernate provides a command-oriented API that may b=
e used for streaming data to and from the database in the form of detached =
objects. A <literal>StatelessSession</literal> has no persistence context a=
ssociated with it and does not provide many of the higher-level life cycle =
semantics. In particular, a stateless session does not implement a first-le=
vel cache nor interact with any second-level or query cache. It does not im=
plement transactional write-behind or automatic dirty checking. Operations =
performed using a stateless session do not ever cascade to associated insta=
nces. Collections are ignored by a stateless session. Operations performed =
via a stateless session bypass Hibernate's event model and interceptors. St=
ateless sessions are vulnerable to data aliasing effects, due to the lack o=
f a first-level cache. A stateless session is a lower-level abstraction, mu=
ch closer to the underlying JDBC."
 msgstr ""
 =

-#: batch.xml:142(para) =

+#. Tag: programlisting
+#: batch.xml:113
+#, no-c-format
+msgid ""
+      "<![CDATA[StatelessSession session =3D sessionFactory.openStatelessS=
ession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "   \n"
+      "ScrollableResults customers =3D session.getNamedQuery(\"GetCustomer=
s\")\n"
+      "    .scroll(ScrollMode.FORWARD_ONLY);\n"
+      "while ( customers.next() ) {\n"
+      "    Customer customer =3D (Customer) customers.get(0);\n"
+      "    customer.updateStuff(...);\n"
+      "    session.update(customer);\n"
+      "}\n"
+      "   \n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:115
+#, no-c-format
 msgid "Note that in this code example, the <literal>Customer</literal> ins=
tances returned by the query are immediately detached. They are never assoc=
iated with any persistence context."
 msgstr ""
 =

-#: batch.xml:148(para) =

+#. Tag: para
+#: batch.xml:121
+#, no-c-format
 msgid "The <literal>insert(), update()</literal> and <literal>delete()</li=
teral> operations defined by the <literal>StatelessSession</literal> interf=
ace are considered to be direct database row-level operations, which result=
 in immediate execution of a SQL <literal>INSERT, UPDATE</literal> or <lite=
ral>DELETE</literal> respectively. Thus, they have very different semantics=
 to the <literal>save(), saveOrUpdate()</literal> and <literal>delete()</li=
teral> operations defined by the <literal>Session</literal> interface."
 msgstr ""
 =

-#: batch.xml:161(title) =

+#. Tag: title
+#: batch.xml:134
+#, no-c-format
 msgid "DML-style operations"
 msgstr ""
 =

-#: batch.xml:163(para) =

-msgid "As already discussed, automatic and transparent object/relational m=
apping is concerned with the management of object state. This implies that =
the object state is available in memory, hence manipulating (using the SQL =
<literal>Data Manipulation Language</literal> (DML) statements: <literal>IN=
SERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>) data =
directly in the database will not affect in-memory state. However, Hibernat=
e provides methods for bulk SQL-style DML statement execution which are per=
formed through the Hibernate Query Language (<xref linkend=3D\"queryhql\">H=
QL</xref>)."
+#. Tag: para
+#: batch.xml:136
+#, no-c-format
+msgid "As already discussed, automatic and transparent object/relational m=
apping is concerned with the management of object state. This implies that =
the object state is available in memory, hence manipulating (using the SQL =
<literal>Data Manipulation Language</literal> (DML) statements: <literal>IN=
SERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>) data =
directly in the database will not affect in-memory state. However, Hibernat=
e provides methods for bulk SQL-style DML statement execution which are per=
formed through the Hibernate Query Language (<link linkend=3D\"queryhql\">H=
QL</link>)."
 msgstr ""
 =

-#: batch.xml:173(para) =

+#. Tag: para
+#: batch.xml:146
+#, no-c-format
 msgid "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE=
</literal> statements is: <literal>( UPDATE | DELETE ) FROM? EntityName (WH=
ERE where_conditions)?</literal>. Some points to note:"
 msgstr ""
 =

-#: batch.xml:181(para) =

+#. Tag: para
+#: batch.xml:154
+#, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr ""
 =

-#: batch.xml:186(para) =

+#. Tag: para
+#: batch.xml:159
+#, no-c-format
 msgid "There can only be a single entity named in the from-clause; it can =
optionally be aliased. If the entity name is aliased, then any property ref=
erences must be qualified using that alias; if the entity name is not alias=
ed, then it is illegal for any property references to be qualified."
 msgstr ""
 =

-#: batch.xml:194(para) =

-msgid "No <xref linkend=3D\"queryhql-joins-forms\">joins</xref> (either im=
plicit or explicit) can be specified in a bulk HQL query. Sub-queries may b=
e used in the where-clause; the subqueries, themselves, may contain joins."
+#. Tag: para
+#: batch.xml:167
+#, no-c-format
+msgid "No <link linkend=3D\"queryhql-joins-forms\">joins</link> (either im=
plicit or explicit) can be specified in a bulk HQL query. Sub-queries may b=
e used in the where-clause; the subqueries, themselves, may contain joins."
 msgstr ""
 =

-#: batch.xml:201(para) =

+#. Tag: para
+#: batch.xml:174
+#, no-c-format
 msgid "The where-clause is also optional."
 msgstr ""
 =

-#: batch.xml:207(para) =

+#. Tag: para
+#: batch.xml:180
+#, no-c-format
 msgid "As an example, to execute an HQL <literal>UPDATE</literal>, use the=
 <literal>Query.executeUpdate()</literal> method (the method is named for t=
hose familiar with JDBC's <literal>PreparedStatement.executeUpdate()</liter=
al>):"
 msgstr ""
 =

-#: batch.xml:225(para) =

-msgid "HQL <literal>UPDATE</literal> statements, by default do not effect =
the <xref linkend=3D\"mapping-declaration-version\">version</xref> or the <=
xref linkend=3D\"mapping-declaration-timestamp\">timestamp</xref> property =
values for the affected entities; this is in keeping with the EJB3 specific=
ation. However, you can force Hibernate to properly reset the <literal>vers=
ion</literal> or <literal>timestamp</literal> property values through the u=
se of a <literal>versioned update</literal>. This is achieved by adding the=
 <literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> k=
eyword."
+#. Tag: programlisting
+#: batch.xml:186
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "\n"
+      "String hqlUpdate =3D \"update Customer c set c.name =3D :newName wh=
ere c.name =3D :oldName\";\n"
+      "// or String hqlUpdate =3D \"update Customer set name =3D :newName =
where name =3D :oldName\";\n"
+      "int updatedEntities =3D s.createQuery( hqlUpdate )\n"
+      "        .setString( \"newName\", newName )\n"
+      "        .setString( \"oldName\", oldName )\n"
+      "        .executeUpdate();\n"
+      "tx.commit();\n"
+      "session.close();]]>"
 msgstr ""
 =

-#: batch.xml:245(para) =

+#. Tag: para
+#: batch.xml:188
+#, no-c-format
+msgid "HQL <literal>UPDATE</literal> statements, by default do not effect =
the <link linkend=3D\"mapping-declaration-version\">version</link> or the <=
link linkend=3D\"mapping-declaration-timestamp\">timestamp</link> property =
values for the affected entities; this is in keeping with the EJB3 specific=
ation. However, you can force Hibernate to properly reset the <literal>vers=
ion</literal> or <literal>timestamp</literal> property values through the u=
se of a <literal>versioned update</literal>. This is achieved by adding the=
 <literal>VERSIONED</literal> keyword after the <literal>UPDATE</literal> k=
eyword."
+msgstr ""
+
+#. Tag: programlisting
+#: batch.xml:198
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "String hqlVersionedUpdate =3D \"update versioned Customer set name =
=3D :newName where name =3D :oldName\";\n"
+      "int updatedEntities =3D s.createQuery( hqlUpdate )\n"
+      "        .setString( \"newName\", newName )\n"
+      "        .setString( \"oldName\", oldName )\n"
+      "        .executeUpdate();\n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:200
+#, no-c-format
 msgid "Note that custom version types (<literal>org.hibernate.usertype.Use=
rVersionType</literal>) are not allowed in conjunction with a <literal>upda=
te versioned</literal> statement."
 msgstr ""
 =

-#: batch.xml:250(para) =

+#. Tag: para
+#: batch.xml:205
+#, no-c-format
 msgid "To execute an HQL <literal>DELETE</literal>, use the same <literal>=
Query.executeUpdate()</literal> method:"
 msgstr ""
 =

-#: batch.xml:266(para) =

+#. Tag: programlisting
+#: batch.xml:210
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "\n"
+      "String hqlDelete =3D \"delete Customer c where c.name =3D :oldName\=
";\n"
+      "// or String hqlDelete =3D \"delete Customer where name =3D :oldNam=
e\";\n"
+      "int deletedEntities =3D s.createQuery( hqlDelete )\n"
+      "        .setString( \"oldName\", oldName )\n"
+      "        .executeUpdate();\n"
+      "tx.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: batch.xml:212
+#, no-c-format
 msgid "The <literal>int</literal> value returned by the <literal>Query.exe=
cuteUpdate()</literal> method indicate the number of entities effected by t=
he operation. Consider this may or may not correlate to the number of rows =
effected in the database. An HQL bulk operation might result in multiple ac=
tual SQL statements being executed, for joined-subclass, for example. The r=
eturned number indicates the number of actual entities affected by the stat=
ement. Going back to the example of joined-subclass, a delete against one o=
f the subclasses may actually result in deletes against not just the table =
to which that subclass is mapped, but also the \"root\" table and potential=
ly joined-subclass tables further down the inheritence hierarchy."
 msgstr ""
 =

-#: batch.xml:277(para) =

+#. Tag: para
+#: batch.xml:223
+#, no-c-format
 msgid "The pseudo-syntax for <literal>INSERT</literal> statements is: <lit=
eral>INSERT INTO EntityName properties_list select_statement</literal>. Som=
e points to note:"
 msgstr ""
 =

-#: batch.xml:285(para) =

+#. Tag: para
+#: batch.xml:231
+#, no-c-format
 msgid "Only the INSERT INTO ... SELECT ... form is supported; not the INSE=
RT INTO ... VALUES ... form."
 msgstr ""
 =

-#: batch.xml:288(para) =

+#. Tag: para
+#: batch.xml:234
+#, no-c-format
 msgid "The properties_list is analogous to the <literal>column speficiatio=
n</literal> in the SQL <literal>INSERT</literal> statement. For entities in=
volved in mapped inheritence, only properties directly defined on that give=
n class-level can be used in the properties_list. Superclass properties are=
 not allowed; and subclass properties do not make sense. In other words, <l=
iteral>INSERT</literal> statements are inherently non-polymorphic."
 msgstr ""
 =

-#: batch.xml:298(para) =

+#. Tag: para
+#: batch.xml:244
+#, no-c-format
 msgid "select_statement can be any valid HQL select query, with the caveat=
 that the return types must match the types expected by the insert. Current=
ly, this is checked during query compilation rather than allowing the check=
 to relegate to the database. Note however that this might cause problems b=
etween Hibernate <literal>Type</literal>s which are <emphasis>equivalent</e=
mphasis> as opposed to <emphasis>equal</emphasis>. This might cause issues =
with mismatches between a property defined as a <literal>org.hibernate.type=
.DateType</literal> and a property defined as a <literal>org.hibernate.type=
.TimestampType</literal>, even though the database might not make a distinc=
tion or might be able to handle the conversion."
 msgstr ""
 =

-#: batch.xml:310(para) =

+#. Tag: para
+#: batch.xml:256
+#, no-c-format
 msgid "For the id property, the insert statement gives you two options. Yo=
u can either explicitly specify the id property in the properties_list (in =
which case its value is taken from the corresponding select expression) or =
omit it from the properties_list (in which case a generated value is used).=
 This later option is only available when using id generators that operate =
in the database; attempting to use this option with any \"in memory\" type =
generators will cause an exception during parsing. Note that for the purpos=
es of this discussion, in-database generators are considered to be <literal=
>org.hibernate.id.SequenceGenerator</literal> (and its subclasses) and any =
implementors of <literal>org.hibernate.id.PostInsertIdentifierGenerator</li=
teral>. The most notable exception here is <literal>org.hibernate.id.TableH=
iLoGenerator</literal>, which cannot be used because it does not expose a s=
electable way to get its values."
 msgstr ""
 =

-#: batch.xml:325(para) =

+#. Tag: para
+#: batch.xml:271
+#, no-c-format
 msgid "For properties mapped as either <literal>version</literal> or <lite=
ral>timestamp</literal>, the insert statement gives you two options. You ca=
n either specify the property in the properties_list (in which case its val=
ue is taken from the corresponding select expressions) or omit it from the =
properties_list (in which case the <literal>seed value</literal> defined by=
 the <literal>org.hibernate.type.VersionType</literal> is used)."
 msgstr ""
 =

-#: batch.xml:335(para) =

+#. Tag: para
+#: batch.xml:281
+#, no-c-format
 msgid "An example HQL <literal>INSERT</literal> statement execution:"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: batch.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: batch.xml:285
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D sessionFactory.openSession();\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "\n"
+      "String hqlInsert =3D \"insert into DelinquentAccount (id, name) sel=
ect c.id, c.name from Customer c where ...\";\n"
+      "int createdEntities =3D s.createQuery( hqlInsert )\n"
+      "        .executeUpdate();\n"
+      "tx.commit();\n"
+      "session.close();]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/best=
_practices.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/best_pract=
ices.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/best_pract=
ices.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,172 +1,250 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:29-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: best_practices.xml:5(title) =

+#. Tag: title
+#: best_practices.xml:29
+#, no-c-format
 msgid "Best Practices"
 msgstr ""
 =

-#: best_practices.xml:9(term) =

+#. Tag: term
+#: best_practices.xml:33
+#, no-c-format
 msgid "Write fine-grained classes and map them using <literal>&lt;componen=
t&gt;</literal>."
 msgstr ""
 =

-#: best_practices.xml:11(para) =

+#. Tag: para
+#: best_practices.xml:35
+#, no-c-format
 msgid "Use an <literal>Address</literal> class to encapsulate <literal>str=
eet</literal>, <literal>suburb</literal>, <literal>state</literal>, <litera=
l>postcode</literal>. This encourages code reuse and simplifies refactoring=
."
 msgstr ""
 =

-#: best_practices.xml:19(term) =

+#. Tag: term
+#: best_practices.xml:43
+#, no-c-format
 msgid "Declare identifier properties on persistent classes."
 msgstr ""
 =

-#: best_practices.xml:21(para) =

+#. Tag: para
+#: best_practices.xml:45
+#, no-c-format
 msgid "Hibernate makes identifier properties optional. There are all sorts=
 of reasons why you should use them. We recommend that identifiers be 'synt=
hetic' (generated, with no business meaning)."
 msgstr ""
 =

-#: best_practices.xml:29(term) =

+#. Tag: term
+#: best_practices.xml:53
+#, no-c-format
 msgid "Identify natural keys."
 msgstr ""
 =

-#: best_practices.xml:31(para) =

+#. Tag: para
+#: best_practices.xml:55
+#, no-c-format
 msgid "Identify natural keys for all entities, and map them using <literal=
>&lt;natural-id&gt;</literal>. Implement <literal>equals()</literal> and <l=
iteral>hashCode()</literal> to compare the properties that make up the natu=
ral key."
 msgstr ""
 =

-#: best_practices.xml:39(term) =

+#. Tag: term
+#: best_practices.xml:63
+#, no-c-format
 msgid "Place each class mapping in its own file."
 msgstr ""
 =

-#: best_practices.xml:41(para) =

+#. Tag: para
+#: best_practices.xml:65
+#, no-c-format
 msgid "Don't use a single monolithic mapping document. Map <literal>com.eg=
.Foo</literal> in the file <literal>com/eg/Foo.hbm.xml</literal>. This make=
s particularly good sense in a team environment."
 msgstr ""
 =

-#: best_practices.xml:49(term) =

+#. Tag: term
+#: best_practices.xml:73
+#, no-c-format
 msgid "Load mappings as resources."
 msgstr ""
 =

-#: best_practices.xml:51(para) =

+#. Tag: para
+#: best_practices.xml:75
+#, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr ""
 =

-#: best_practices.xml:57(term) =

+#. Tag: term
+#: best_practices.xml:81
+#, no-c-format
 msgid "Consider externalising query strings."
 msgstr ""
 =

-#: best_practices.xml:59(para) =

+#. Tag: para
+#: best_practices.xml:83
+#, no-c-format
 msgid "This is a good practice if your queries call non-ANSI-standard SQL =
functions. Externalising the query strings to mapping files will make the a=
pplication more portable."
 msgstr ""
 =

-#: best_practices.xml:67(term) =

+#. Tag: term
+#: best_practices.xml:91
+#, no-c-format
 msgid "Use bind variables."
 msgstr ""
 =

-#: best_practices.xml:69(para) =

+#. Tag: para
+#: best_practices.xml:93
+#, no-c-format
 msgid "As in JDBC, always replace non-constant values by \"?\". Never use =
string manipulation to bind a non-constant value in a query! Even better, c=
onsider using named parameters in queries."
 msgstr ""
 =

-#: best_practices.xml:77(term) =

+#. Tag: term
+#: best_practices.xml:101
+#, no-c-format
 msgid "Don't manage your own JDBC connections."
 msgstr ""
 =

-#: best_practices.xml:79(para) =

+#. Tag: para
+#: best_practices.xml:103
+#, no-c-format
 msgid "Hibernate lets the application manage JDBC connections. This approa=
ch should be considered a last-resort. If you can't use the built-in connec=
tions providers, consider providing your own implementation of <literal>org=
.hibernate.connection.ConnectionProvider</literal>."
 msgstr ""
 =

-#: best_practices.xml:87(term) =

+#. Tag: term
+#: best_practices.xml:111
+#, no-c-format
 msgid "Consider using a custom type."
 msgstr ""
 =

-#: best_practices.xml:89(para) =

+#. Tag: para
+#: best_practices.xml:113
+#, no-c-format
 msgid "Suppose you have a Java type, say from some library, that needs to =
be persisted but doesn't provide the accessors needed to map it as a compon=
ent. You should consider implementing <literal>org.hibernate.UserType</lite=
ral>. This approach frees the application code from implementing transforma=
tions to / from a Hibernate type."
 msgstr ""
 =

-#: best_practices.xml:98(term) =

+#. Tag: term
+#: best_practices.xml:122
+#, no-c-format
 msgid "Use hand-coded JDBC in bottlenecks."
 msgstr ""
 =

-#: best_practices.xml:100(para) =

+#. Tag: para
+#: best_practices.xml:124
+#, no-c-format
 msgid "In performance-critical areas of the system, some kinds of operatio=
ns might benefit from direct JDBC. But please, wait until you <emphasis>kno=
w</emphasis> something is a bottleneck. And don't assume that direct JDBC i=
s necessarily faster. If you need to use direct JDBC, it might be worth ope=
ning a Hibernate <literal>Session</literal> and using that JDBC connection.=
 That way you can still use the same transaction strategy and underlying co=
nnection provider."
 msgstr ""
 =

-#: best_practices.xml:110(term) =

+#. Tag: term
+#: best_practices.xml:134
+#, no-c-format
 msgid "Understand <literal>Session</literal> flushing."
 msgstr ""
 =

-#: best_practices.xml:112(para) =

+#. Tag: para
+#: best_practices.xml:136
+#, no-c-format
 msgid "From time to time the Session synchronizes its persistent state wit=
h the database. Performance will be affected if this process occurs too oft=
en. You may sometimes minimize unnecessary flushing by disabling automatic =
flushing or even by changing the order of queries and other operations with=
in a particular transaction."
 msgstr ""
 =

-#: best_practices.xml:121(term) =

+#. Tag: term
+#: best_practices.xml:145
+#, no-c-format
 msgid "In a three tiered architecture, consider using detached objects."
 msgstr ""
 =

-#: best_practices.xml:123(para) =

+#. Tag: para
+#: best_practices.xml:147
+#, no-c-format
 msgid "When using a servlet / session bean architecture, you could pass pe=
rsistent objects loaded in the session bean to and from the servlet / JSP l=
ayer. Use a new session to service each request. Use <literal>Session.merge=
()</literal> or <literal>Session.saveOrUpdate()</literal> to synchronize ob=
jects with the database."
 msgstr ""
 =

-#: best_practices.xml:132(term) =

+#. Tag: term
+#: best_practices.xml:156
+#, no-c-format
 msgid "In a two tiered architecture, consider using long persistence conte=
xts."
 msgstr ""
 =

-#: best_practices.xml:134(para) =

+#. Tag: para
+#: best_practices.xml:158
+#, no-c-format
 msgid "Database Transactions have to be as short as possible for best scal=
ability. However, it is often neccessary to implement long running <emphasi=
s>application transactions</emphasis>, a single unit-of-work from the point=
 of view of a user. An application transaction might span several client re=
quest/response cycles. It is common to use detached objects to implement ap=
plication transactions. An alternative, extremely appropriate in two tiered=
 architecture, is to maintain a single open persistence contact (session) f=
or the whole life cycle of the application transaction and simply disconnec=
t from the JDBC connection at the end of each request and reconnect at the =
beginning of the subsequent request. Never share a single session across mo=
re than one application transaction, or you will be working with stale data=
."
 msgstr ""
 =

-#: best_practices.xml:148(term) =

+#. Tag: term
+#: best_practices.xml:172
+#, no-c-format
 msgid "Don't treat exceptions as recoverable."
 msgstr ""
 =

-#: best_practices.xml:150(para) =

+#. Tag: para
+#: best_practices.xml:174
+#, no-c-format
 msgid "This is more of a necessary practice than a \"best\" practice. When=
 an exception occurs, roll back the <literal>Transaction</literal> and clos=
e the <literal>Session</literal>. If you don't, Hibernate can't guarantee t=
hat in-memory state accurately represents persistent state. As a special ca=
se of this, do not use <literal>Session.load()</literal> to determine if an=
 instance with the given identifier exists on the database; use <literal>Se=
ssion.get()</literal> or a query instead."
 msgstr ""
 =

-#: best_practices.xml:160(term) =

+#. Tag: term
+#: best_practices.xml:184
+#, no-c-format
 msgid "Prefer lazy fetching for associations."
 msgstr ""
 =

-#: best_practices.xml:162(para) =

+#. Tag: para
+#: best_practices.xml:186
+#, no-c-format
 msgid "Use eager fetching sparingly. Use proxies and lazy collections for =
most associations to classes that are not likely to be completely held in t=
he second-level cache. For associations to cached classes, where there is a=
n a extremely high probability of a cache hit, explicitly disable eager fet=
ching using <literal>lazy=3D\"false\"</literal>. When an join fetching is a=
ppropriate to a particular use case, use a query with a <literal>left join =
fetch</literal>."
 msgstr ""
 =

-#: best_practices.xml:172(term) =

+#. Tag: term
+#: best_practices.xml:196
+#, no-c-format
 msgid "Use the <emphasis>open session in view</emphasis> pattern, or a dis=
ciplined <emphasis>assembly phase</emphasis> to avoid problems with unfetch=
ed data."
 msgstr ""
 =

-#: best_practices.xml:177(para) =

+#. Tag: para
+#: best_practices.xml:201
+#, no-c-format
 msgid "Hibernate frees the developer from writing tedious <emphasis>Data T=
ransfer Objects</emphasis> (DTO). In a traditional EJB architecture, DTOs s=
erve dual purposes: first, they work around the problem that entity beans a=
re not serializable; second, they implicitly define an assembly phase where=
 all data to be used by the view is fetched and marshalled into the DTOs be=
fore returning control to the presentation tier. Hibernate eliminates the f=
irst purpose. However, you will still need an assembly phase (think of your=
 business methods as having a strict contract with the presentation tier ab=
out what data is available in the detached objects) unless you are prepared=
 to hold the persistence context (the session) open across the view renderi=
ng process. This is not a limitation of Hibernate! It is a fundamental requ=
irement of safe transactional data access."
 msgstr ""
 =

-#: best_practices.xml:191(term) =

+#. Tag: term
+#: best_practices.xml:215
+#, no-c-format
 msgid "Consider abstracting your business logic from Hibernate."
 msgstr ""
 =

-#: best_practices.xml:193(para) =

+#. Tag: para
+#: best_practices.xml:217
+#, no-c-format
 msgid "Hide (Hibernate) data-access code behind an interface. Combine the =
<emphasis>DAO</emphasis> and <emphasis>Thread Local Session</emphasis> patt=
erns. You can even have some classes persisted by handcoded JDBC, associate=
d to Hibernate via a <literal>UserType</literal>. (This advice is intended =
for \"sufficiently large\" applications; it is not appropriate for an appli=
cation with five tables!)"
 msgstr ""
 =

-#: best_practices.xml:203(term) =

+#. Tag: term
+#: best_practices.xml:227
+#, no-c-format
 msgid "Don't use exotic association mappings."
 msgstr ""
 =

-#: best_practices.xml:205(para) =

+#. Tag: para
+#: best_practices.xml:229
+#, no-c-format
 msgid "Good usecases for a real many-to-many associations are rare. Most o=
f the time you need additional information stored in the \"link table\". In=
 this case, it is much better to use two one-to-many associations to an int=
ermediate link class. In fact, we think that most associations are one-to-m=
any and many-to-one, you should be careful when using any other association=
 style and ask yourself if it is really neccessary."
 msgstr ""
 =

-#: best_practices.xml:215(term) =

+#. Tag: term
+#: best_practices.xml:239
+#, no-c-format
 msgid "Prefer bidirectional associations."
 msgstr ""
 =

-#: best_practices.xml:217(para) =

+#. Tag: para
+#: best_practices.xml:241
+#, no-c-format
 msgid "Unidirectional associations are more difficult to query. In a large=
 application, almost all associations must be navigable in both directions =
in queries."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: best_practices.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/coll=
ection_mapping.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/collection=
_mapping.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/collection=
_mapping.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,492 +1,1193 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:30-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: collection_mapping.xml:5(title) =

+#. Tag: title
+#: collection_mapping.xml:29
+#, no-c-format
 msgid "Collection Mapping"
 msgstr ""
 =

-#: collection_mapping.xml:8(title) =

+#. Tag: title
+#: collection_mapping.xml:32
+#, no-c-format
 msgid "Persistent collections"
 msgstr ""
 =

-#: collection_mapping.xml:10(para) =

+#. Tag: para
+#: collection_mapping.xml:34
+#, no-c-format
 msgid "Hibernate requires that persistent collection-valued fields be decl=
ared as an interface type, for example:"
 msgstr ""
 =

-#: collection_mapping.xml:25(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:39
+#, no-c-format
+msgid ""
+      "<![CDATA[public class Product {\n"
+      "    private String serialNumber;\n"
+      "    private Set parts =3D new HashSet();\n"
+      "    \n"
+      "    public Set getParts() { return parts; }\n"
+      "    void setParts(Set parts) { this.parts =3D parts; }\n"
+      "    public String getSerialNumber() { return serialNumber; }\n"
+      "    void setSerialNumber(String sn) { serialNumber =3D sn; }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:41
+#, no-c-format
 msgid "The actual interface might be <literal>java.util.Set</literal>, <li=
teral>java.util.Collection</literal>, <literal>java.util.List</literal>, <l=
iteral>java.util.Map</literal>, <literal>java.util.SortedSet</literal>, <li=
teral>java.util.SortedMap</literal> or ... anything you like! (Where \"anyt=
hing you like\" means you will have to write an implementation of <literal>=
org.hibernate.usertype.UserCollectionType</literal>.)"
 msgstr ""
 =

-#: collection_mapping.xml:34(para) =

+#. Tag: para
+#: collection_mapping.xml:50
+#, no-c-format
 msgid "Notice how we initialized the instance variable with an instance of=
 <literal>HashSet</literal>. This is the best way to initialize collection =
valued properties of newly instantiated (non-persistent) instances. When yo=
u make the instance persistent - by calling <literal>persist()</literal>, f=
or example - Hibernate will actually replace the <literal>HashSet</literal>=
 with an instance of Hibernate's own implementation of <literal>Set</litera=
l>. Watch out for errors like this:"
 msgstr ""
 =

-#: collection_mapping.xml:54(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:60
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D new DomesticCat();\n"
+      "Cat kitten =3D new DomesticCat();\n"
+      "....\n"
+      "Set kittens =3D new HashSet();\n"
+      "kittens.add(kitten);\n"
+      "cat.setKittens(kittens);\n"
+      "session.persist(cat);\n"
+      "kittens =3D cat.getKittens(); // Okay, kittens collection is a Set\=
n"
+      "(HashSet) cat.getKittens(); // Error!]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:62
+#, no-c-format
 msgid "The persistent collections injected by Hibernate behave like <liter=
al>HashMap</literal>, <literal>HashSet</literal>, <literal>TreeMap</literal=
>, <literal>TreeSet</literal> or <literal>ArrayList</literal>, depending up=
on the interface type."
 msgstr ""
 =

-#: collection_mapping.xml:61(para) =

+#. Tag: para
+#: collection_mapping.xml:69
+#, no-c-format
 msgid "Collections instances have the usual behavior of value types. They =
are automatically persisted when referenced by a persistent object and auto=
matically deleted when unreferenced. If a collection is passed from one per=
sistent object to another, its elements might be moved from one table to an=
other. Two entities may not share a reference to the same collection instan=
ce. Due to the underlying relational model, collection-valued properties do=
 not support null value semantics; Hibernate does not distinguish between a=
 null collection reference and an empty collection."
 msgstr ""
 =

-#: collection_mapping.xml:72(para) =

+#. Tag: para
+#: collection_mapping.xml:80
+#, no-c-format
 msgid "You shouldn't have to worry much about any of this. Use persistent =
collections the same way you use ordinary Java collections. Just make sure =
you understand the semantics of bidirectional associations (discussed later=
)."
 msgstr ""
 =

-#: collection_mapping.xml:81(title) =

+#. Tag: title
+#: collection_mapping.xml:89
+#, no-c-format
 msgid "Collection mappings"
 msgstr ""
 =

-#: collection_mapping.xml:83(para) =

+#. Tag: para
+#: collection_mapping.xml:92
+#, no-c-format
+msgid "There are quite a range of mappings that can be generated for colle=
ctions, covering many common relational models. We suggest you experiment w=
ith the schema generation tool to get a feeling for how various mapping dec=
larations translate to database tables."
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:99
+#, no-c-format
 msgid "The Hibernate mapping element used for mapping a collection depends=
 upon the type of the interface. For example, a <literal>&lt;set&gt;</liter=
al> element is used for mapping properties of type <literal>Set</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:97(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:105
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Product\">\n"
+      "    <id name=3D\"serialNumber\" column=3D\"productSerialNumber\"/>\=
n"
+      "    <set name=3D\"parts\">\n"
+      "        <key column=3D\"productSerialNumber\" not-null=3D\"true\"/>=
\n"
+      "        <one-to-many class=3D\"Part\"/>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:107
+#, no-c-format
 msgid "Apart from <literal>&lt;set&gt;</literal>, there is also <literal>&=
lt;list&gt;</literal>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;=
</literal>, <literal>&lt;array&gt;</literal> and <literal>&lt;primitive-arr=
ay&gt;</literal> mapping elements. The <literal>&lt;map&gt;</literal> eleme=
nt is representative:"
 msgstr ""
 =

-#: collection_mapping.xml:147(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:132
+#, no-c-format
+msgid ""
+      "<![CDATA[<map\n"
+      "    name=3D\"propertyName\"\n"
+      "    table=3D\"table_name\"\n"
+      "    schema=3D\"schema_name\"\n"
+      "    lazy=3D\"true|extra|false\"\n"
+      "    inverse=3D\"true|false\"\n"
+      "    cascade=3D\"all|none|save-update|delete|all-delete-orphan|delet=
e-orphan\"\n"
+      "    sort=3D\"unsorted|natural|comparatorClass\"\n"
+      "    order-by=3D\"column_name asc|desc\"\n"
+      "    where=3D\"arbitrary sql where condition\"\n"
+      "    fetch=3D\"join|select|subselect\"\n"
+      "    batch-size=3D\"N\"\n"
+      "    access=3D\"field|property|ClassName\"\n"
+      "    optimistic-lock=3D\"true|false\"\n"
+      "    mutable=3D\"true|false\"\n"
+      "    node=3D\"element-name|.\"\n"
+      "    embed-xml=3D\"true|false\"\n"
+      ">\n"
+      "\n"
+      "    <key .... />\n"
+      "    <map-key .... />\n"
+      "    <element .... />\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:135
+#, no-c-format
 msgid "<literal>name</literal> the collection property name"
 msgstr ""
 =

-#: collection_mapping.xml:152(para) =

+#. Tag: para
+#: collection_mapping.xml:140
+#, no-c-format
 msgid "<literal>table</literal> (optional - defaults to property name) the=
 name of the collection table (not used for one-to-many associations)"
 msgstr ""
 =

-#: collection_mapping.xml:158(para) =

+#. Tag: para
+#: collection_mapping.xml:146
+#, no-c-format
 msgid "<literal>schema</literal> (optional) the name of a table schema to =
override the schema declared on the root element"
 msgstr ""
 =

-#: collection_mapping.xml:164(para) =

+#. Tag: para
+#: collection_mapping.xml:152
+#, no-c-format
 msgid "<literal>lazy</literal> (optional - defaults to <literal>true</lite=
ral>) may be used to disable lazy fetching and specify that the association=
 is always eagerly fetched, or to enable \"extra-lazy\" fetching where most=
 operations do not initialize the collection (suitable for very large colle=
ctions)"
 msgstr ""
 =

-#: collection_mapping.xml:173(para) =

+#. Tag: para
+#: collection_mapping.xml:161
+#, no-c-format
 msgid "<literal>inverse</literal> (optional - defaults to <literal>false</=
literal>) mark this collection as the \"inverse\" end of a bidirectional as=
sociation"
 msgstr ""
 =

-#: collection_mapping.xml:179(para) =

+#. Tag: para
+#: collection_mapping.xml:167
+#, no-c-format
 msgid "<literal>cascade</literal> (optional - defaults to <literal>none</l=
iteral>) enable operations to cascade to child entities"
 msgstr ""
 =

-#: collection_mapping.xml:185(para) =

+#. Tag: para
+#: collection_mapping.xml:173
+#, no-c-format
 msgid "<literal>sort</literal> (optional) specify a sorted collection with=
 <literal>natural</literal> sort order, or a given comparator class"
 msgstr ""
 =

-#: collection_mapping.xml:191(para) =

+#. Tag: para
+#: collection_mapping.xml:179
+#, no-c-format
 msgid "<literal>order-by</literal> (optional, JDK1.4 only) specify a table=
 column (or columns) that define the iteration order of the <literal>Map</l=
iteral>, <literal>Set</literal> or bag, together with an optional <literal>=
asc</literal> or <literal>desc</literal>"
 msgstr ""
 =

-#: collection_mapping.xml:198(para) =

+#. Tag: para
+#: collection_mapping.xml:186
+#, no-c-format
 msgid "<literal>where</literal> (optional) specify an arbitrary SQL <liter=
al>WHERE</literal> condition to be used when retrieving or removing the col=
lection (useful if the collection should contain only a subset of the avail=
able data)"
 msgstr ""
 =

-#: collection_mapping.xml:205(para) =

+#. Tag: para
+#: collection_mapping.xml:193
+#, no-c-format
 msgid "<literal>fetch</literal> (optional, defaults to <literal>select</li=
teral>) Choose between outer-join fetching, fetching by sequential select, =
and fetching by sequential subselect."
 msgstr ""
 =

-#: collection_mapping.xml:212(para) =

+#. Tag: para
+#: collection_mapping.xml:200
+#, no-c-format
 msgid "<literal>batch-size</literal> (optional, defaults to <literal>1</li=
teral>) specify a \"batch size\" for lazily fetching instances of this coll=
ection."
 msgstr ""
 =

-#: collection_mapping.xml:218(para) =

+#. Tag: para
+#: collection_mapping.xml:206
+#, no-c-format
 msgid "<literal>access</literal> (optional - defaults to <literal>property=
</literal>): The strategy Hibernate should use for accessing the collection=
 property value."
 msgstr ""
 =

-#: collection_mapping.xml:224(para) =

+#. Tag: para
+#: collection_mapping.xml:212
+#, no-c-format
 msgid "<literal>optimistic-lock</literal> (optional - defaults to <literal=
>true</literal>): Species that changes to the state of the collection resul=
ts in increment of the owning entity's version. (For one to many associatio=
ns, it is often reasonable to disable this setting.)"
 msgstr ""
 =

-#: collection_mapping.xml:232(para) =

+#. Tag: para
+#: collection_mapping.xml:220
+#, no-c-format
 msgid "<literal>mutable</literal> (optional - defaults to <literal>true</l=
iteral>): A value of <literal>false</literal> specifies that the elements o=
f the collection never change (a minor performance optimization in some cas=
es)."
 msgstr ""
 =

-#: collection_mapping.xml:242(title) =

+#. Tag: title
+#: collection_mapping.xml:230
+#, no-c-format
 msgid "Collection foreign keys"
 msgstr ""
 =

-#: collection_mapping.xml:244(para) =

+#. Tag: para
+#: collection_mapping.xml:232
+#, no-c-format
 msgid "Collection instances are distinguished in the database by the forei=
gn key of the entity that owns the collection. This foreign key is referred=
 to as the <emphasis>collection key column</emphasis> (or columns) of the c=
ollection table. The collection key column is mapped by the <literal>&lt;ke=
y&gt;</literal> element."
 msgstr ""
 =

-#: collection_mapping.xml:252(para) =

+#. Tag: para
+#: collection_mapping.xml:240
+#, no-c-format
 msgid "There may be a nullability constraint on the foreign key column. Fo=
r most collections, this is implied. For unidirectional one to many associa=
tions, the foreign key column is nullable by default, so you might need to =
specify <literal>not-null=3D\"true\"</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:261(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:247
+#, no-c-format
+msgid "<![CDATA[<key column=3D\"productSerialNumber\" not-null=3D\"true\"/=
>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:249
+#, no-c-format
 msgid "The foreign key constraint may use <literal>ON DELETE CASCADE</lite=
ral>."
 msgstr ""
 =

-#: collection_mapping.xml:267(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:253
+#, no-c-format
+msgid "<![CDATA[<key column=3D\"productSerialNumber\" on-delete=3D\"cascad=
e\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:255
+#, no-c-format
 msgid "See the previous chapter for a full definition of the <literal>&lt;=
key&gt;</literal> element."
 msgstr ""
 =

-#: collection_mapping.xml:275(title) =

+#. Tag: title
+#: collection_mapping.xml:263
+#, no-c-format
 msgid "Collection elements"
 msgstr ""
 =

-#: collection_mapping.xml:277(para) =

+#. Tag: para
+#: collection_mapping.xml:265
+#, no-c-format
 msgid "Collections may contain almost any other Hibernate type, including =
all basic types, custom types, components, and of course, references to oth=
er entities. This is an important distinction: an object in a collection mi=
ght be handled with \"value\" semantics (its life cycle fully depends on th=
e collection owner) or it might be a reference to another entity, with its =
own life cycle. In the latter case, only the \"link\" between the two objec=
ts is considered to be state held by the collection."
 msgstr ""
 =

-#: collection_mapping.xml:286(para) =

+#. Tag: para
+#: collection_mapping.xml:274
+#, no-c-format
 msgid "The contained type is referred to as the <emphasis>collection eleme=
nt type</emphasis>. Collection elements are mapped by <literal>&lt;element&=
gt;</literal> or <literal>&lt;composite-element&gt;</literal>, or in the ca=
se of entity references, with <literal>&lt;one-to-many&gt;</literal> or <li=
teral>&lt;many-to-many&gt;</literal>. The first two map elements with value=
 semantics, the next two are used to map entity associations."
 msgstr ""
 =

-#: collection_mapping.xml:298(title) =

+#. Tag: title
+#: collection_mapping.xml:286
+#, no-c-format
 msgid "Indexed collections"
 msgstr ""
 =

-#: collection_mapping.xml:300(para) =

+#. Tag: para
+#: collection_mapping.xml:288
+#, no-c-format
 msgid "All collection mappings, except those with set and bag semantics, n=
eed an <emphasis>index column</emphasis> in the collection table - a column=
 that maps to an array index, or <literal>List</literal> index, or <literal=
>Map</literal> key. The index of a <literal>Map</literal> may be of any bas=
ic type, mapped with <literal>&lt;map-key&gt;</literal>, it may be an entit=
y reference mapped with <literal>&lt;map-key-many-to-many&gt;</literal>, or=
 it may be a composite type, mapped with <literal>&lt;composite-map-key&gt;=
</literal>. The index of an array or list is always of type <literal>intege=
r</literal> and is mapped using the <literal>&lt;list-index&gt;</literal> e=
lement. The mapped column contains sequential integers (numbered from zero,=
 by default)."
 msgstr ""
 =

-#: collection_mapping.xml:323(para) =

-msgid "<literal>column_name</literal> (required): The name of the column h=
olding the collection index values."
+#. Tag: sect2
+#: collection_mapping.xml:299
+#, no-c-format
+msgid ""
+      "<programlistingco> <areaspec> <area id=3D\"index1\" coords=3D\"2 45=
\"/> <area id=3D\"index2\" coords=3D\"3 45\"/> </areaspec> <programlisting>=
<![CDATA[<list-index \n"
+      "        column=3D\"column_name\"\n"
+      "        base=3D\"0|1|...\"/>]]></programlisting> <calloutlist> <cal=
lout arearefs=3D\"index1\"> <para> <literal>column_name</literal> (required=
): The name of the column holding the collection index values. </para> </ca=
llout> <callout arearefs=3D\"index1\"> <para> <literal>base</literal> (opti=
onal, defaults to <literal>0</literal>): The value of the index column that=
 corresponds to the first element of the list or array. </para> </callout> =
</calloutlist> </programlistingco> <programlistingco> <areaspec> <area id=
=3D\"mapkey1\" coords=3D\"2 45\"/> <area id=3D\"mapkey2\" coords=3D\"3 45\"=
/> <area id=3D\"mapkey3\" coords=3D\"4 45\"/> </areaspec> <programlisting><=
![CDATA[<map-key \n"
+      "        column=3D\"column_name\"\n"
+      "        formula=3D\"any SQL expression\"\n"
+      "        type=3D\"type_name\"\n"
+      "        node=3D\"@attribute-name\"\n"
+      "        length=3D\"N\"/>]]></programlisting> <calloutlist> <callout=
 arearefs=3D\"mapkey1\"> <para> <literal>column</literal> (optional): The n=
ame of the column holding the collection index values. </para> </callout> <=
callout arearefs=3D\"mapkey2\"> <para> <literal>formula</literal> (optional=
): A SQL formula used to evaluate the key of the map. </para> </callout> <c=
allout arearefs=3D\"mapkey3\"> <para> <literal>type</literal> (reguired): T=
he type of the map keys. </para> </callout> </calloutlist> </programlisting=
co> <programlistingco> <areaspec> <area id=3D\"indexmanytomany1\" coords=3D=
\"2 45\"/> <area id=3D\"indexmanytomany2\" coords=3D\"3 45\"/> <area id=3D\=
"indexmanytomany3\" coords=3D\"3 45\"/> </areaspec> <programlisting><![CDAT=
A[<map-key-many-to-many\n"
+      "        column=3D\"column_name\"\n"
+      "        formula=3D\"any SQL expression\"\n"
+      "        class=3D\"ClassName\"\n"
+      "/>]]></programlisting> <calloutlist> <callout arearefs=3D\"indexman=
ytomany1\"> <para> <literal>column</literal> (optional): The name of the fo=
reign key column for the collection index values. </para> </callout> <callo=
ut arearefs=3D\"indexmanytomany2\"> <para> <literal>formula</literal> (opti=
onal): A SQL formula used to evaluate the foreign key of the map key. </par=
a> </callout> <callout arearefs=3D\"indexmanytomany3\"> <para> <literal>cla=
ss</literal> (required): The entity class used as the map key. </para> </ca=
llout> </calloutlist> </programlistingco>"
 msgstr ""
 =

-#: collection_mapping.xml:329(para) =

-msgid "<literal>base</literal> (optional, defaults to <literal>0</literal>=
): The value of the index column that corresponds to the first element of t=
he list or array."
-msgstr ""
-
-#: collection_mapping.xml:351(para) =

-msgid "<literal>column</literal> (optional): The name of the column holdin=
g the collection index values."
-msgstr ""
-
-#: collection_mapping.xml:357(para) =

-msgid "<literal>formula</literal> (optional): A SQL formula used to evalua=
te the key of the map."
-msgstr ""
-
-#: collection_mapping.xml:363(para) =

-msgid "<literal>type</literal> (reguired): The type of the map keys."
-msgstr ""
-
-#: collection_mapping.xml:383(para) =

-msgid "<literal>column</literal> (optional): The name of the foreign key c=
olumn for the collection index values."
-msgstr ""
-
-#: collection_mapping.xml:389(para) =

-msgid "<literal>formula</literal> (optional): A SQL formula used to evalua=
te the foreign key of the map key."
-msgstr ""
-
-#: collection_mapping.xml:395(para) =

-msgid "<literal>class</literal> (required): The entity class used as the m=
ap key."
-msgstr ""
-
-#: collection_mapping.xml:403(para) =

+#. Tag: para
+#: collection_mapping.xml:380
+#, no-c-format
 msgid "If your table doesn't have an index column, and you still wish to u=
se <literal>List</literal> as the property type, you should map the propert=
y as a Hibernate <emphasis>&lt;bag&gt;</emphasis>. A bag does not retain it=
s order when it is retrieved from the database, but it may be optionally so=
rted or ordered."
 msgstr ""
 =

-#: collection_mapping.xml:412(para) =

-msgid "There are quite a range of mappings that can be generated for colle=
ctions, covering many common relational models. We suggest you experiment w=
ith the schema generation tool to get a feeling for how various mapping dec=
larations translate to database tables."
-msgstr ""
-
-#: collection_mapping.xml:419(title) =

+#. Tag: title
+#: collection_mapping.xml:390
+#, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr ""
 =

-#: collection_mapping.xml:421(para) =

+#. Tag: para
+#: collection_mapping.xml:392
+#, no-c-format
 msgid "Any collection of values or many-to-many association requires a ded=
icated <emphasis>collection table</emphasis> with a foreign key column or c=
olumns, <emphasis>collection element column</emphasis> or columns and possi=
bly an index column or columns."
 msgstr ""
 =

-#: collection_mapping.xml:428(para) =

+#. Tag: para
+#: collection_mapping.xml:399
+#, no-c-format
 msgid "For a collection of values, we use the <literal>&lt;element&gt;</li=
teral> tag."
 msgstr ""
 =

-#: collection_mapping.xml:451(para) =

-msgid "<literal>column</literal> (optional): The name of the column holdin=
g the collection element values."
+#. Tag: sect2
+#: collection_mapping.xml:401
+#, no-c-format
+msgid ""
+      "<programlistingco> <areaspec> <area id=3D\"element1b\" coords=3D\"2=
 50\"/> <area id=3D\"element2b\" coords=3D\"3 50\"/> <area id=3D\"element3b=
\" coords=3D\"4 50\"/> </areaspec> <programlisting><![CDATA[<element\n"
+      "        column=3D\"column_name\"\n"
+      "        formula=3D\"any SQL expression\"\n"
+      "        type=3D\"typename\"\n"
+      "        length=3D\"L\"\n"
+      "        precision=3D\"P\"\n"
+      "        scale=3D\"S\"\n"
+      "        not-null=3D\"true|false\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        node=3D\"element-name\"\n"
+      "/>]]></programlisting> <calloutlist> <callout arearefs=3D\"element1=
b\"> <para> <literal>column</literal> (optional): The name of the column ho=
lding the collection element values. </para> </callout> <callout arearefs=
=3D\"element2b\"> <para> <literal>formula</literal> (optional): An SQL form=
ula used to evaluate the element. </para> </callout> <callout arearefs=3D\"=
element3b\"> <para> <literal>type</literal> (required): The type of the col=
lection element. </para> </callout> </calloutlist> </programlistingco> <par=
a> A <emphasis>many-to-many association</emphasis> is specified using the <=
literal>&lt;many-to-many&gt;</literal> element. </para> <programlistingco> =
<areaspec> <area id=3D\"manytomany1\" coords=3D\"2 60\"/> <area id=3D\"many=
tomany2\" coords=3D\"3 60\"/> <area id=3D\"manytomany3\" coords=3D\"4 60\"/=
> <area id=3D\"manytomany4\" coords=3D\"5 60\"/> <area id=3D\"manytomany5\"=
 coords=3D\"6 60\"/> <area id=3D\"manytomany6\" coords=3D\"7 60\"/> <area i=
d=3D\"manytomany7\" coords=3D\"8 60\"/> <area id=3D\!
 "manytomany8\" coords=3D\"9 60\"/> </areaspec> <programlisting><![CDATA[<m=
any-to-many\n"
+      "        column=3D\"column_name\"\n"
+      "        formula=3D\"any SQL expression\"\n"
+      "        class=3D\"ClassName\"\n"
+      "        fetch=3D\"select|join\"\n"
+      "        unique=3D\"true|false\"\n"
+      "        not-found=3D\"ignore|exception\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        property-ref=3D\"propertyNameFromAssociatedClass\"\n"
+      "        node=3D\"element-name\"\n"
+      "        embed-xml=3D\"true|false\"\n"
+      "    />]]></programlisting> <calloutlist> <callout arearefs=3D\"many=
tomany1\"> <para> <literal>column</literal> (optional): The name of the ele=
ment foreign key column. </para> </callout> <callout arearefs=3D\"manytoman=
y2\"> <para> <literal>formula</literal> (optional): An SQL formula used to =
evaluate the element foreign key value. </para> </callout> <callout arearef=
s=3D\"manytomany3\"> <para> <literal>class</literal> (required): The name o=
f the associated class. </para> </callout> <callout arearefs=3D\"manytomany=
4\"> <para> <literal>fetch</literal> (optional - defaults to <literal>join<=
/literal>): enables outer-join or sequential select fetching for this assoc=
iation. This is a special case; for full eager fetching (in a single <liter=
al>SELECT</literal>) of an entity and its many-to-many relationships to oth=
er entities, you would enable <literal>join</literal> fetching not only of =
the collection itself, but also with this attribute on the <literal>&lt;man=
y-to-many&gt;</literal!
 > nested element. </para> </callout> <callout arearefs=3D\"manytomany5\"> =
<para> <literal>unique</literal> (optional): Enable the DDL generation of a=
 unique constraint for the foreign-key column. This makes the association m=
ultiplicity effectively one to many. </para> </callout> <callout arearefs=
=3D\"manytomany6\"> <para> <literal>not-found</literal> (optional - default=
s to <literal>exception</literal>): Specifies how foreign keys that referen=
ce missing rows will be handled: <literal>ignore</literal> will treat a mis=
sing row as a null association. </para> </callout> <callout arearefs=3D\"ma=
nytomany7\"> <para> <literal>entity-name</literal> (optional): The entity n=
ame of the associated class, as an alternative to <literal>class</literal>.=
 </para> </callout> <callout arearefs=3D\"manytomany8\"> <para> <literal>pr=
operty-ref</literal>: (optional) The name of a property of the associated c=
lass that is joined to this foreign key. If not specified, the primary key =
of the associated class !
 is used. </para> </callout> </calloutlist> </programlistingco>"
 msgstr ""
 =

-#: collection_mapping.xml:457(para) =

-msgid "<literal>formula</literal> (optional): An SQL formula used to evalu=
ate the element."
+#. Tag: para
+#: collection_mapping.xml:506
+#, no-c-format
+msgid "Some examples, first, a set of strings:"
 msgstr ""
 =

-#: collection_mapping.xml:463(para) =

-msgid "<literal>type</literal> (required): The type of the collection elem=
ent."
+#. Tag: programlisting
+#: collection_mapping.xml:510
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"names\" table=3D\"person_names\">\n"
+      "    <key column=3D\"person_id\"/>\n"
+      "    <element column=3D\"person_name\" type=3D\"string\"/>\n"
+      "</set>]]>"
 msgstr ""
 =

-#: collection_mapping.xml:470(para) =

-msgid "A <emphasis>many-to-many association</emphasis> is specified using =
the <literal>&lt;many-to-many&gt;</literal> element."
+#. Tag: para
+#: collection_mapping.xml:512
+#, no-c-format
+msgid "A bag containing integers (with an iteration order determined by th=
e <literal>order-by</literal> attribute):"
 msgstr ""
 =

-#: collection_mapping.xml:500(para) =

-msgid "<literal>column</literal> (optional): The name of the element forei=
gn key column."
+#. Tag: programlisting
+#: collection_mapping.xml:517
+#, no-c-format
+msgid ""
+      "<![CDATA[<bag name=3D\"sizes\" \n"
+      "        table=3D\"item_sizes\" \n"
+      "        order-by=3D\"size asc\">\n"
+      "    <key column=3D\"item_id\"/>\n"
+      "    <element column=3D\"size\" type=3D\"integer\"/>\n"
+      "</bag>]]>"
 msgstr ""
 =

-#: collection_mapping.xml:505(para) =

-msgid "<literal>formula</literal> (optional): An SQL formula used to evalu=
ate the element foreign key value."
+#. Tag: para
+#: collection_mapping.xml:519
+#, no-c-format
+msgid "An array of entities - in this case, a many to many association:"
 msgstr ""
 =

-#: collection_mapping.xml:511(para) collection_mapping.xml:665(para) =

-msgid "<literal>class</literal> (required): The name of the associated cla=
ss."
+#. Tag: programlisting
+#: collection_mapping.xml:523
+#, no-c-format
+msgid ""
+      "<![CDATA[<array name=3D\"addresses\" \n"
+      "        table=3D\"PersonAddress\" \n"
+      "        cascade=3D\"persist\">\n"
+      "    <key column=3D\"personId\"/>\n"
+      "    <list-index column=3D\"sortOrder\"/>\n"
+      "    <many-to-many column=3D\"addressId\" class=3D\"Address\"/>\n"
+      "</array>]]>"
 msgstr ""
 =

-#: collection_mapping.xml:516(para) =

-msgid "<literal>fetch</literal> (optional - defaults to <literal>join</lit=
eral>): enables outer-join or sequential select fetching for this associati=
on. This is a special case; for full eager fetching (in a single <literal>S=
ELECT</literal>) of an entity and its many-to-many relationships to other e=
ntities, you would enable <literal>join</literal> fetching not only of the =
collection itself, but also with this attribute on the <literal>&lt;many-to=
-many&gt;</literal> nested element."
+#. Tag: para
+#: collection_mapping.xml:525
+#, no-c-format
+msgid "A map from string indices to dates:"
 msgstr ""
 =

-#: collection_mapping.xml:527(para) =

-msgid "<literal>unique</literal> (optional): Enable the DDL generation of =
a unique constraint for the foreign-key column. This makes the association =
multiplicity effectively one to many."
+#. Tag: programlisting
+#: collection_mapping.xml:529
+#, no-c-format
+msgid ""
+      "<![CDATA[<map name=3D\"holidays\" \n"
+      "        table=3D\"holidays\" \n"
+      "        schema=3D\"dbo\" \n"
+      "        order-by=3D\"hol_name asc\">\n"
+      "    <key column=3D\"id\"/>\n"
+      "    <map-key column=3D\"hol_name\" type=3D\"string\"/>\n"
+      "    <element column=3D\"hol_date\" type=3D\"date\"/>\n"
+      "</map>]]>"
 msgstr ""
 =

-#: collection_mapping.xml:534(para) =

-msgid "<literal>not-found</literal> (optional - defaults to <literal>excep=
tion</literal>): Specifies how foreign keys that reference missing rows wil=
l be handled: <literal>ignore</literal> will treat a missing row as a null =
association."
+#. Tag: para
+#: collection_mapping.xml:531
+#, no-c-format
+msgid "A list of components (discussed in the next chapter):"
 msgstr ""
 =

-#: collection_mapping.xml:541(para) collection_mapping.xml:677(para) =

-msgid "<literal>entity-name</literal> (optional): The entity name of the a=
ssociated class, as an alternative to <literal>class</literal>."
+#. Tag: programlisting
+#: collection_mapping.xml:535
+#, no-c-format
+msgid ""
+      "<![CDATA[<list name=3D\"carComponents\" \n"
+      "        table=3D\"CarComponents\">\n"
+      "    <key column=3D\"carId\"/>\n"
+      "    <list-index column=3D\"sortOrder\"/>\n"
+      "    <composite-element class=3D\"CarComponent\">\n"
+      "        <property name=3D\"price\"/>\n"
+      "        <property name=3D\"type\"/>\n"
+      "        <property name=3D\"serialNumber\" column=3D\"serialNum\"/>\=
n"
+      "    </composite-element>\n"
+      "</list>]]>"
 msgstr ""
 =

-#: collection_mapping.xml:547(para) =

-msgid "<literal>property-ref</literal>: (optional) The name of a property =
of the associated class that is joined to this foreign key. If not specifie=
d, the primary key of the associated class is used."
+#. Tag: title
+#: collection_mapping.xml:540
+#, no-c-format
+msgid "One-to-many associations"
 msgstr ""
 =

-#: collection_mapping.xml:556(para) =

-msgid "Some examples, first, a set of strings:"
+#. Tag: para
+#: collection_mapping.xml:542
+#, no-c-format
+msgid "A <emphasis>one to many association</emphasis> links the tables of =
two classes via a foreign key, with no intervening collection table. This m=
apping loses certain semantics of normal Java collections:"
 msgstr ""
 =

-#: collection_mapping.xml:565(para) =

-msgid "A bag containing integers (with an iteration order determined by th=
e <literal>order-by</literal> attribute):"
+#. Tag: para
+#: collection_mapping.xml:550
+#, no-c-format
+msgid "An instance of the contained entity class may not belong to more th=
an one instance of the collection"
 msgstr ""
 =

-#: collection_mapping.xml:577(para) =

-msgid "An array of entities - in this case, a many to many association:"
+#. Tag: para
+#: collection_mapping.xml:556
+#, no-c-format
+msgid "An instance of the contained entity class may not appear at more th=
an one value of the collection index"
 msgstr ""
 =

-#: collection_mapping.xml:589(para) =

-msgid "A map from string indices to dates:"
+#. Tag: para
+#: collection_mapping.xml:563
+#, no-c-format
+msgid "An association from <literal>Product</literal> to <literal>Part</li=
teral> requires existence of a foreign key column and possibly an index col=
umn to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</l=
iteral> tag indicates that this is a one to many association."
 msgstr ""
 =

-#: collection_mapping.xml:602(para) =

-msgid "A list of components (discussed in the next chapter):"
+#. Tag: programlisting
+#: collection_mapping.xml:576
+#, no-c-format
+msgid ""
+      "<![CDATA[<one-to-many \n"
+      "        class=3D\"ClassName\"\n"
+      "        not-found=3D\"ignore|exception\"\n"
+      "        entity-name=3D\"EntityName\"\n"
+      "        node=3D\"element-name\"\n"
+      "        embed-xml=3D\"true|false\"\n"
+      "    />]]>"
 msgstr ""
 =

-#: collection_mapping.xml:620(title) =

-msgid "One-to-many associations"
+#. Tag: para
+#: collection_mapping.xml:579
+#, no-c-format
+msgid "<literal>class</literal> (required): The name of the associated cla=
ss."
 msgstr ""
 =

-#: collection_mapping.xml:622(para) =

-msgid "A <emphasis>one to many association</emphasis> links the tables of =
two classes via a foreign key, with no intervening collection table. This m=
apping loses certain semantics of normal Java collections:"
+#. Tag: para
+#: collection_mapping.xml:584
+#, no-c-format
+msgid "<literal>not-found</literal> (optional - defaults to <literal>excep=
tion</literal>): Specifies how cached identifiers that reference missing ro=
ws will be handled: <literal>ignore</literal> will treat a missing row as a=
 null association."
 msgstr ""
 =

-#: collection_mapping.xml:630(para) =

-msgid "An instance of the contained entity class may not belong to more th=
an one instance of the collection"
+#. Tag: para
+#: collection_mapping.xml:591
+#, no-c-format
+msgid "<literal>entity-name</literal> (optional): The entity name of the a=
ssociated class, as an alternative to <literal>class</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:636(para) =

-msgid "An instance of the contained entity class may not appear at more th=
an one value of the collection index"
-msgstr ""
-
-#: collection_mapping.xml:643(para) =

-msgid "An association from <literal>Product</literal> to <literal>Part</li=
teral> requires existence of a foreign key column and possibly an index col=
umn to the <literal>Part</literal> table. A <literal>&lt;one-to-many&gt;</l=
iteral> tag indicates that this is a one to many association."
-msgstr ""
-
-#: collection_mapping.xml:670(para) =

-msgid "<literal>not-found</literal> (optional - defaults to <literal>excep=
tion</literal>): Specifies how cached identifiers that reference missing ro=
ws will be handled: <literal>ignore</literal> will treat a missing row as a=
 null association."
-msgstr ""
-
-#: collection_mapping.xml:685(para) =

+#. Tag: para
+#: collection_mapping.xml:599
+#, no-c-format
 msgid "Notice that the <literal>&lt;one-to-many&gt;</literal> element does=
 not need to declare any columns. Nor is it necessary to specify the <liter=
al>table</literal> name anywhere."
 msgstr ""
 =

-#: collection_mapping.xml:691(para) =

+#. Tag: para
+#: collection_mapping.xml:605
+#, no-c-format
 msgid "<emphasis>Very important note:</emphasis> If the foreign key column=
 of a <literal>&lt;one-to-many&gt;</literal> association is declared <liter=
al>NOT NULL</literal>, you must declare the <literal>&lt;key&gt;</literal> =
mapping <literal>not-null=3D\"true\"</literal> or <emphasis>use a bidirecti=
onal association</emphasis> with the collection mapping marked <literal>inv=
erse=3D\"true\"</literal>. See the discussion of bidirectional associations=
 later in this chapter."
 msgstr ""
 =

-#: collection_mapping.xml:700(para) =

+#. Tag: para
+#: collection_mapping.xml:614
+#, no-c-format
 msgid "This example shows a map of <literal>Part</literal> entities by nam=
e (where <literal>partName</literal> is a persistent property of <literal>P=
art</literal>). Notice the use of a formula-based index."
 msgstr ""
 =

-#: collection_mapping.xml:717(title) =

+#. Tag: programlisting
+#: collection_mapping.xml:620
+#, no-c-format
+msgid ""
+      "<![CDATA[<map name=3D\"parts\"\n"
+      "        cascade=3D\"all\">\n"
+      "    <key column=3D\"productId\" not-null=3D\"true\"/>\n"
+      "    <map-key formula=3D\"partName\"/>\n"
+      "    <one-to-many class=3D\"Part\"/>\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: title
+#: collection_mapping.xml:626
+#, no-c-format
 msgid "Advanced collection mappings"
 msgstr ""
 =

-#: collection_mapping.xml:720(title) =

+#. Tag: title
+#: collection_mapping.xml:629
+#, no-c-format
 msgid "Sorted collections"
 msgstr ""
 =

-#: collection_mapping.xml:722(para) =

+#. Tag: para
+#: collection_mapping.xml:631
+#, no-c-format
 msgid "Hibernate supports collections implementing <literal>java.util.Sort=
edMap</literal> and <literal>java.util.SortedSet</literal>. You must specif=
y a comparator in the mapping file:"
 msgstr ""
 =

-#: collection_mapping.xml:740(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:636
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"aliases\" \n"
+      "            table=3D\"person_aliases\" \n"
+      "            sort=3D\"natural\">\n"
+      "    <key column=3D\"person\"/>\n"
+      "    <element column=3D\"name\" type=3D\"string\"/>\n"
+      "</set>\n"
+      "\n"
+      "<map name=3D\"holidays\" sort=3D\"my.custom.HolidayComparator\">\n"
+      "    <key column=3D\"year_id\"/>\n"
+      "    <map-key column=3D\"hol_name\" type=3D\"string\"/>\n"
+      "    <element column=3D\"hol_date\" type=3D\"date\"/>\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:638
+#, no-c-format
 msgid "Allowed values of the <literal>sort</literal> attribute are <litera=
l>unsorted</literal>, <literal>natural</literal> and the name of a class im=
plementing <literal>java.util.Comparator</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:746(para) =

+#. Tag: para
+#: collection_mapping.xml:644
+#, no-c-format
 msgid "Sorted collections actually behave like <literal>java.util.TreeSet<=
/literal> or <literal>java.util.TreeMap</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:751(para) =

+#. Tag: para
+#: collection_mapping.xml:649
+#, no-c-format
 msgid "If you want the database itself to order the collection elements us=
e the <literal>order-by</literal> attribute of <literal>set</literal>, <lit=
eral>bag</literal> or <literal>map</literal> mappings. This solution is onl=
y available under JDK 1.4 or higher (it is implemented using <literal>Linke=
dHashSet</literal> or <literal>LinkedHashMap</literal>). This performs the =
ordering in the SQL query, not in memory."
 msgstr ""
 =

-#: collection_mapping.xml:771(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:658
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"aliases\" table=3D\"person_aliases\" order-b=
y=3D\"lower(name) asc\">\n"
+      "    <key column=3D\"person\"/>\n"
+      "    <element column=3D\"name\" type=3D\"string\"/>\n"
+      "</set>\n"
+      "\n"
+      "<map name=3D\"holidays\" order-by=3D\"hol_date, hol_name\">\n"
+      "    <key column=3D\"year_id\"/>\n"
+      "    <map-key column=3D\"hol_name\" type=3D\"string\"/>\n"
+      "    <element column=3D\"hol_date type=3D\"date\"/>\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:660
+#, no-c-format
 msgid "Note that the value of the <literal>order-by</literal> attribute is=
 an SQL ordering, not a HQL ordering!"
 msgstr ""
 =

-#: collection_mapping.xml:776(para) =

+#. Tag: para
+#: collection_mapping.xml:665
+#, no-c-format
 msgid "Associations may even be sorted by some arbitrary criteria at runti=
me using a collection <literal>filter()</literal>."
 msgstr ""
 =

-#: collection_mapping.xml:786(title) =

+#. Tag: programlisting
+#: collection_mapping.xml:670
+#, no-c-format
+msgid "<![CDATA[sortedUsers =3D s.createFilter( group.getUsers(), \"order =
by this.name\" ).list();]]>"
+msgstr ""
+
+#. Tag: title
+#: collection_mapping.xml:675
+#, no-c-format
 msgid "Bidirectional associations"
 msgstr ""
 =

-#: collection_mapping.xml:795(term) =

+#. Tag: para
+#: collection_mapping.xml:677
+#, no-c-format
+msgid "A <emphasis>bidirectional association</emphasis> allows navigation =
from both \"ends\" of the association. Two kinds of bidirectional associati=
on are supported:"
+msgstr ""
+
+#. Tag: term
+#: collection_mapping.xml:684
+#, no-c-format
 msgid "one-to-many"
 msgstr ""
 =

-#: collection_mapping.xml:797(para) =

+#. Tag: para
+#: collection_mapping.xml:686
+#, no-c-format
 msgid "set or bag valued at one end, single-valued at the other"
 msgstr ""
 =

-#: collection_mapping.xml:803(term) =

+#. Tag: term
+#: collection_mapping.xml:692
+#, no-c-format
 msgid "many-to-many"
 msgstr ""
 =

-#: collection_mapping.xml:805(para) =

+#. Tag: para
+#: collection_mapping.xml:694
+#, no-c-format
 msgid "set or bag valued at both ends"
 msgstr ""
 =

-#: collection_mapping.xml:788(para) =

-msgid "A <emphasis>bidirectional association</emphasis> allows navigation =
from both \"ends\" of the association. Two kinds of bidirectional associati=
on are supported: <placeholder-1/>"
-msgstr ""
-
-#: collection_mapping.xml:814(para) =

+#. Tag: para
+#: collection_mapping.xml:703
+#, no-c-format
 msgid "You may specify a bidirectional many-to-many association simply by =
mapping two many-to-many associations to the same database table and declar=
ing one end as <emphasis>inverse</emphasis> (which one is your choice, but =
it can not be an indexed collection)."
 msgstr ""
 =

-#: collection_mapping.xml:821(para) =

+#. Tag: para
+#: collection_mapping.xml:710
+#, no-c-format
 msgid "Here's an example of a bidirectional many-to-many association; each=
 category can have many items and each item can be in many categories:"
 msgstr ""
 =

-#: collection_mapping.xml:846(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:715
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Category\">\n"
+      "    <id name=3D\"id\" column=3D\"CATEGORY_ID\"/>\n"
+      "    ...\n"
+      "    <bag name=3D\"items\" table=3D\"CATEGORY_ITEM\">\n"
+      "        <key column=3D\"CATEGORY_ID\"/>\n"
+      "        <many-to-many class=3D\"Item\" column=3D\"ITEM_ID\"/>\n"
+      "    </bag>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Item\">\n"
+      "    <id name=3D\"id\" column=3D\"ITEM_ID\"/>\n"
+      "    ...\n"
+      "\n"
+      "    <!-- inverse end -->\n"
+      "    <bag name=3D\"categories\" table=3D\"CATEGORY_ITEM\" inverse=3D=
\"true\">\n"
+      "        <key column=3D\"ITEM_ID\"/>\n"
+      "        <many-to-many class=3D\"Category\" column=3D\"CATEGORY_ID\"=
/>\n"
+      "    </bag>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:717
+#, no-c-format
 msgid "Changes made only to the inverse end of the association are <emphas=
is>not</emphasis> persisted. This means that Hibernate has two representati=
ons in memory for every bidirectional association, one link from A to B and=
 another link from B to A. This is easier to understand if you think about =
the Java object model and how we create a many-to-many relationship in Java=
:"
 msgstr ""
 =

-#: collection_mapping.xml:861(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:725
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "category.getItems().add(item);          // The category now \"knows=
\" about the relationship\n"
+      "item.getCategories().add(category);     // The item now \"knows\" a=
bout the relationship\n"
+      "\n"
+      "session.persist(item);                   // The relationship won't =
be saved!\n"
+      "session.persist(category);               // The relationship will b=
e saved]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:727
+#, no-c-format
 msgid "The non-inverse side is used to save the in-memory representation t=
o the database."
 msgstr ""
 =

-#: collection_mapping.xml:865(para) =

+#. Tag: para
+#: collection_mapping.xml:731
+#, no-c-format
 msgid "You may define a bidirectional one-to-many association by mapping a=
 one-to-many association to the same table column(s) as a many-to-one assoc=
iation and declaring the many-valued end <literal>inverse=3D\"true\"</liter=
al>."
 msgstr ""
 =

-#: collection_mapping.xml:889(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:737
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Parent\">\n"
+      "    <id name=3D\"id\" column=3D\"parent_id\"/>\n"
+      "    ....\n"
+      "    <set name=3D\"children\" inverse=3D\"true\">\n"
+      "        <key column=3D\"parent_id\"/>\n"
+      "        <one-to-many class=3D\"Child\"/>\n"
+      "    </set>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Child\">\n"
+      "    <id name=3D\"id\" column=3D\"child_id\"/>\n"
+      "    ....\n"
+      "    <many-to-one name=3D\"parent\" \n"
+      "        class=3D\"Parent\" \n"
+      "        column=3D\"parent_id\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:739
+#, no-c-format
 msgid "Mapping one end of an association with <literal>inverse=3D\"true\"<=
/literal> doesn't affect the operation of cascades, these are orthogonal co=
ncepts!"
 msgstr ""
 =

-#: collection_mapping.xml:897(title) =

+#. Tag: title
+#: collection_mapping.xml:747
+#, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr ""
 =

-#: collection_mapping.xml:898(para) =

+#. Tag: para
+#: collection_mapping.xml:748
+#, no-c-format
 msgid "A bidirectional association where one end is represented as a <lite=
ral>&lt;list&gt;</literal> or <literal>&lt;map&gt;</literal> requires speci=
al consideration. If there is a property of the child class which maps to t=
he index column, no problem, we can continue using <literal>inverse=3D\"tru=
e\"</literal> on the collection mapping:"
 msgstr ""
 =

-#: collection_mapping.xml:927(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:755
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Parent\">\n"
+      "    <id name=3D\"id\" column=3D\"parent_id\"/>\n"
+      "    ....\n"
+      "    <map name=3D\"children\" inverse=3D\"true\">\n"
+      "        <key column=3D\"parent_id\"/>\n"
+      "        <map-key column=3D\"name\" \n"
+      "            type=3D\"string\"/>\n"
+      "        <one-to-many class=3D\"Child\"/>\n"
+      "    </map>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Child\">\n"
+      "    <id name=3D\"id\" column=3D\"child_id\"/>\n"
+      "    ....\n"
+      "    <property name=3D\"name\" \n"
+      "        not-null=3D\"true\"/>\n"
+      "    <many-to-one name=3D\"parent\" \n"
+      "        class=3D\"Parent\" \n"
+      "        column=3D\"parent_id\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:757
+#, no-c-format
 msgid "But, if there is no such property on the child class, we can't thin=
k of the association as truly bidirectional (there is information available=
 at one end of the association that is not available at the other end). In =
this case, we can't map the collection <literal>inverse=3D\"true\"</literal=
>. Instead, we could use the following mapping:"
 msgstr ""
 =

-#: collection_mapping.xml:957(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:764
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Parent\">\n"
+      "    <id name=3D\"id\" column=3D\"parent_id\"/>\n"
+      "    ....\n"
+      "    <map name=3D\"children\">\n"
+      "        <key column=3D\"parent_id\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "        <map-key column=3D\"name\" \n"
+      "            type=3D\"string\"/>\n"
+      "        <one-to-many class=3D\"Child\"/>\n"
+      "    </map>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Child\">\n"
+      "    <id name=3D\"id\" column=3D\"child_id\"/>\n"
+      "    ....\n"
+      "    <many-to-one name=3D\"parent\" \n"
+      "        class=3D\"Parent\" \n"
+      "        column=3D\"parent_id\"\n"
+      "        insert=3D\"false\"\n"
+      "        update=3D\"false\"\n"
+      "        not-null=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:766
+#, no-c-format
 msgid "Note that in this mapping, the collection-valued end of the associa=
tion is responsible for updates to the foreign key. TODO: Does this really =
result in some unnecessary update statements?"
 msgstr ""
 =

-#: collection_mapping.xml:965(title) =

+#. Tag: title
+#: collection_mapping.xml:774
+#, no-c-format
 msgid "Ternary associations"
 msgstr ""
 =

-#: collection_mapping.xml:967(para) =

+#. Tag: para
+#: collection_mapping.xml:776
+#, no-c-format
 msgid "There are three possible approaches to mapping a ternary associatio=
n. One is to use a <literal>Map</literal> with an association as its index:"
 msgstr ""
 =

-#: collection_mapping.xml:984(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:781
+#, no-c-format
+msgid ""
+      "<![CDATA[<map name=3D\"contracts\">\n"
+      "    <key column=3D\"employer_id\" not-null=3D\"true\"/>\n"
+      "    <map-key-many-to-many column=3D\"employee_id\" class=3D\"Employ=
ee\"/>\n"
+      "    <one-to-many class=3D\"Contract\"/>\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: collection_mapping.xml:783
+#, no-c-format
+msgid ""
+      "<![CDATA[<map name=3D\"connections\">\n"
+      "    <key column=3D\"incoming_node_id\"/>\n"
+      "    <map-key-many-to-many column=3D\"outgoing_node_id\" class=3D\"N=
ode\"/>\n"
+      "    <many-to-many column=3D\"connection_id\" class=3D\"Connection\"=
/>\n"
+      "</map>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:785
+#, no-c-format
 msgid "A second approach is to simply remodel the association as an entity=
 class. This is the approach we use most commonly."
 msgstr ""
 =

-#: collection_mapping.xml:989(para) =

+#. Tag: para
+#: collection_mapping.xml:790
+#, no-c-format
 msgid "A final alternative is to use composite elements, which we will dis=
cuss later."
 msgstr ""
 =

-#: collection_mapping.xml:996(literal) =

+#. Tag: literal
+#: collection_mapping.xml:797
+#, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr ""
 =

-#: collection_mapping.xml:998(para) =

+#. Tag: para
+#: collection_mapping.xml:799
+#, no-c-format
 msgid "If you've fully embraced our view that composite keys are a bad thi=
ng and that entities should have synthetic identifiers (surrogate keys), th=
en you might find it a bit odd that the many to many associations and colle=
ctions of values that we've shown so far all map to tables with composite k=
eys! Now, this point is quite arguable; a pure association table doesn't se=
em to benefit much from a surrogate key (though a collection of composite v=
alues <emphasis>might</emphasis>). Nevertheless, Hibernate provides a featu=
re that allows you to map many to many associations and collections of valu=
es to a table with a surrogate key."
 msgstr ""
 =

-#: collection_mapping.xml:1009(para) =

+#. Tag: para
+#: collection_mapping.xml:810
+#, no-c-format
 msgid "The <literal>&lt;idbag&gt;</literal> element lets you map a <litera=
l>List</literal> (or <literal>Collection</literal>) with bag semantics."
 msgstr ""
 =

-#: collection_mapping.xml:1022(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:815
+#, no-c-format
+msgid ""
+      "<![CDATA[<idbag name=3D\"lovers\" table=3D\"LOVERS\">\n"
+      "    <collection-id column=3D\"ID\" type=3D\"long\">\n"
+      "        <generator class=3D\"sequence\"/>\n"
+      "    </collection-id>\n"
+      "    <key column=3D\"PERSON1\"/>\n"
+      "    <many-to-many column=3D\"PERSON2\" class=3D\"Person\" fetch=3D\=
"join\"/>\n"
+      "</idbag>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:817
+#, no-c-format
 msgid "As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic=
 id generator, just like an entity class! A different surrogate key is assi=
gned to each collection row. Hibernate does not provide any mechanism to di=
scover the surrogate key value of a particular row, however."
 msgstr ""
 =

-#: collection_mapping.xml:1029(para) =

+#. Tag: para
+#: collection_mapping.xml:824
+#, no-c-format
 msgid "Note that the update performance of an <literal>&lt;idbag&gt;</lite=
ral> is <emphasis>much</emphasis> better than a regular <literal>&lt;bag&gt=
;</literal>! Hibernate can locate individual rows efficiently and update or=
 delete them individually, just like a list, map or set."
 msgstr ""
 =

-#: collection_mapping.xml:1036(para) =

+#. Tag: para
+#: collection_mapping.xml:831
+#, no-c-format
 msgid "In the current implementation, the <literal>native</literal> identi=
fier generation strategy is not supported for <literal>&lt;idbag&gt;</liter=
al> collection identifiers."
 msgstr ""
 =

-#: collection_mapping.xml:1060(title) =

+#. Tag: title
+#: collection_mapping.xml:855
+#, no-c-format
 msgid "Collection examples"
 msgstr ""
 =

-#: collection_mapping.xml:1062(para) =

+#. Tag: para
+#: collection_mapping.xml:857
+#, no-c-format
 msgid "The previous sections are pretty confusing. So lets look at an exam=
ple. This class:"
 msgstr ""
 =

-#: collection_mapping.xml:1084(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:862
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "import java.util.Set;\n"
+      "\n"
+      "public class Parent {\n"
+      "    private long id;\n"
+      "    private Set children;\n"
+      "\n"
+      "    public long getId() { return id; }\n"
+      "    private void setId(long id) { this.id=3Did; }\n"
+      "\n"
+      "    private Set getChildren() { return children; }\n"
+      "    private void setChildren(Set children) { this.children=3Dchildr=
en; }\n"
+      "\n"
+      "    ....\n"
+      "    ....\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:864
+#, no-c-format
 msgid "has a collection of <literal>Child</literal> instances. If each chi=
ld has at most one parent, the most natural mapping is a one-to-many associ=
ation:"
 msgstr ""
 =

-#: collection_mapping.xml:1111(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:870
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Parent\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <set name=3D\"children\">\n"
+      "            <key column=3D\"parent_id\"/>\n"
+      "            <one-to-many class=3D\"Child\"/>\n"
+      "        </set>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Child\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:872
+#, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr ""
 =

-#: collection_mapping.xml:1119(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:876
+#, no-c-format
+msgid ""
+      "<![CDATA[create table parent ( id bigint not null primary key )\n"
+      "create table child ( id bigint not null primary key, name varchar(2=
55), parent_id bigint )\n"
+      "alter table child add constraint childfk0 (parent_id) references pa=
rent]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:878
+#, no-c-format
 msgid "If the parent is <emphasis>required</emphasis>, use a bidirectional=
 one-to-many association:"
 msgstr ""
 =

-#: collection_mapping.xml:1146(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:883
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Parent\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <set name=3D\"children\" inverse=3D\"true\">\n"
+      "            <key column=3D\"parent_id\"/>\n"
+      "            <one-to-many class=3D\"Child\"/>\n"
+      "        </set>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Child\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "        <many-to-one name=3D\"parent\" class=3D\"Parent\" column=3D=
\"parent_id\" not-null=3D\"true\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:885
+#, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr ""
 =

-#: collection_mapping.xml:1157(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:889
+#, no-c-format
+msgid ""
+      "<![CDATA[create table parent ( id bigint not null primary key )\n"
+      "create table child ( id bigint not null\n"
+      "                     primary key,\n"
+      "                     name varchar(255),\n"
+      "                     parent_id bigint not null )\n"
+      "alter table child add constraint childfk0 (parent_id) references pa=
rent]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:891
+#, no-c-format
 msgid "Alternatively, if you absolutely insist that this association shoul=
d be unidirectional, you can declare the <literal>NOT NULL</literal> constr=
aint on the <literal>&lt;key&gt;</literal> mapping:"
 msgstr ""
 =

-#: collection_mapping.xml:1184(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:897
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Parent\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <set name=3D\"children\">\n"
+      "            <key column=3D\"parent_id\" not-null=3D\"true\"/>\n"
+      "            <one-to-many class=3D\"Child\"/>\n"
+      "        </set>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Child\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:899
+#, no-c-format
 msgid "On the other hand, if a child might have multiple parents, a many-t=
o-many association is appropriate:"
 msgstr ""
 =

-#: collection_mapping.xml:1210(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:904
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Parent\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <set name=3D\"children\" table=3D\"childset\">\n"
+      "            <key column=3D\"parent_id\"/>\n"
+      "            <many-to-many class=3D\"Child\" column=3D\"child_id\"/>=
\n"
+      "        </set>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Child\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:906
+#, no-c-format
 msgid "Table definitions:"
 msgstr ""
 =

-#: collection_mapping.xml:1222(para) =

+#. Tag: programlisting
+#: collection_mapping.xml:910
+#, no-c-format
+msgid ""
+      "<![CDATA[create table parent ( id bigint not null primary key )\n"
+      "create table child ( id bigint not null primary key, name varchar(2=
55) )\n"
+      "create table childset ( parent_id bigint not null,\n"
+      "                        child_id bigint not null,\n"
+      "                        primary key ( parent_id, child_id ) )\n"
+      "alter table childset add constraint childsetfk0 (parent_id) referen=
ces parent\n"
+      "alter table childset add constraint childsetfk1 (child_id) referenc=
es child]]>"
+msgstr ""
+
+#. Tag: para
+#: collection_mapping.xml:912
+#, no-c-format
 msgid "For more examples and a complete walk-through a parent/child relati=
onship mapping, see <xref linkend=3D\"example-parentchild\"/>."
 msgstr ""
 =

-#: collection_mapping.xml:1227(para) =

+#. Tag: para
+#: collection_mapping.xml:917
+#, no-c-format
 msgid "Even more exotic association mappings are possible, we will catalog=
 all possibilities in the next chapter."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: collection_mapping.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/comp=
onent_mapping.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/component_=
mapping.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/component_=
mapping.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,164 +1,476 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:30-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: component_mapping.xml:5(title) =

+#. Tag: title
+#: component_mapping.xml:29
+#, no-c-format
 msgid "Component Mapping"
 msgstr ""
 =

-#: component_mapping.xml:7(para) =

+#. Tag: para
+#: component_mapping.xml:31
+#, no-c-format
 msgid "The notion of a <emphasis>component</emphasis> is re-used in severa=
l different contexts, for different purposes, throughout Hibernate."
 msgstr ""
 =

-#: component_mapping.xml:13(title) =

+#. Tag: title
+#: component_mapping.xml:37
+#, no-c-format
 msgid "Dependent objects"
 msgstr ""
 =

-#: component_mapping.xml:15(para) =

+#. Tag: para
+#: component_mapping.xml:39
+#, no-c-format
 msgid "A component is a contained object that is persisted as a value type=
, not an entity reference. The term \"component\" refers to the object-orie=
nted notion of composition (not to architecture-level components). For exam=
ple, you might model a person like this:"
 msgstr ""
 =

-#: component_mapping.xml:71(para) =

+#. Tag: programlisting
+#: component_mapping.xml:45
+#, no-c-format
+msgid ""
+      "<![CDATA[public class Person {\n"
+      "    private java.util.Date birthday;\n"
+      "    private Name name;\n"
+      "    private String key;\n"
+      "    public String getKey() {\n"
+      "        return key;\n"
+      "    }\n"
+      "    private void setKey(String key) {\n"
+      "        this.key=3Dkey;\n"
+      "    }\n"
+      "    public java.util.Date getBirthday() {\n"
+      "        return birthday;\n"
+      "    }\n"
+      "    public void setBirthday(java.util.Date birthday) {\n"
+      "        this.birthday =3D birthday;\n"
+      "    }\n"
+      "    public Name getName() {\n"
+      "        return name;\n"
+      "    }\n"
+      "    public void setName(Name name) {\n"
+      "        this.name =3D name;\n"
+      "    }\n"
+      "    ......\n"
+      "    ......\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: component_mapping.xml:47
+#, no-c-format
+msgid ""
+      "<![CDATA[public class Name {\n"
+      "    char initial;\n"
+      "    String first;\n"
+      "    String last;\n"
+      "    public String getFirst() {\n"
+      "        return first;\n"
+      "    }\n"
+      "    void setFirst(String first) {\n"
+      "        this.first =3D first;\n"
+      "    }\n"
+      "    public String getLast() {\n"
+      "        return last;\n"
+      "    }\n"
+      "    void setLast(String last) {\n"
+      "        this.last =3D last;\n"
+      "    }\n"
+      "    public char getInitial() {\n"
+      "        return initial;\n"
+      "    }\n"
+      "    void setInitial(char initial) {\n"
+      "        this.initial =3D initial;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:49
+#, no-c-format
 msgid "Now <literal>Name</literal> may be persisted as a component of <lit=
eral>Person</literal>. Notice that <literal>Name</literal> defines getter a=
nd setter methods for its persistent properties, but doesn't need to declar=
e any interfaces or identifier properties."
 msgstr ""
 =

-#: component_mapping.xml:78(para) =

+#. Tag: para
+#: component_mapping.xml:56
+#, no-c-format
 msgid "Our Hibernate mapping would look like:"
 msgstr ""
 =

-#: component_mapping.xml:94(para) =

+#. Tag: programlisting
+#: component_mapping.xml:60
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Person\" table=3D\"person\">\n"
+      "    <id name=3D\"Key\" column=3D\"pid\" type=3D\"string\">\n"
+      "        <generator class=3D\"uuid\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"birthday\" type=3D\"date\"/>\n"
+      "    <component name=3D\"Name\" class=3D\"eg.Name\"> <!-- class attr=
ibute optional -->\n"
+      "        <property name=3D\"initial\"/>\n"
+      "        <property name=3D\"first\"/>\n"
+      "        <property name=3D\"last\"/>\n"
+      "    </component>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:62
+#, no-c-format
 msgid "The person table would have the columns <literal>pid</literal>, <li=
teral>birthday</literal>, <literal>initial</literal>, <literal>first</liter=
al> and <literal>last</literal>."
 msgstr ""
 =

-#: component_mapping.xml:102(para) =

+#. Tag: para
+#: component_mapping.xml:70
+#, no-c-format
 msgid "Like all value types, components do not support shared references. =
In other words, two persons could have the same name, but the two person ob=
jects would contain two independent name ojects, only \"the same\" by value=
. The null value semantics of a component are <emphasis>ad hoc</emphasis>. =
When reloading the containing object, Hibernate will assume that if all com=
ponent columns are null, then the entire component is null. This should be =
okay for most purposes."
 msgstr ""
 =

-#: component_mapping.xml:111(para) =

+#. Tag: para
+#: component_mapping.xml:79
+#, no-c-format
 msgid "The properties of a component may be of any Hibernate type (collect=
ions, many-to-one associations, other components, etc). Nested components s=
hould <emphasis>not</emphasis> be considered an exotic usage. Hibernate is =
intended to support a very fine-grained object model."
 msgstr ""
 =

-#: component_mapping.xml:118(para) =

+#. Tag: para
+#: component_mapping.xml:86
+#, no-c-format
 msgid "The <literal>&lt;component&gt;</literal> element allows a <literal>=
&lt;parent&gt;</literal> subelement that maps a property of the component c=
lass as a reference back to the containing entity."
 msgstr ""
 =

-#: component_mapping.xml:140(title) =

+#. Tag: programlisting
+#: component_mapping.xml:92
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Person\" table=3D\"person\">\n"
+      "    <id name=3D\"Key\" column=3D\"pid\" type=3D\"string\">\n"
+      "        <generator class=3D\"uuid\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"birthday\" type=3D\"date\"/>\n"
+      "    <component name=3D\"Name\" class=3D\"eg.Name\" unique=3D\"true\=
">\n"
+      "        <parent name=3D\"namedPerson\"/> <!-- reference back to the=
 Person -->\n"
+      "        <property name=3D\"initial\"/>\n"
+      "        <property name=3D\"first\"/>\n"
+      "        <property name=3D\"last\"/>\n"
+      "    </component>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: component_mapping.xml:97
+#, no-c-format
 msgid "Collections of dependent objects"
 msgstr ""
 =

-#: component_mapping.xml:142(para) =

+#. Tag: para
+#: component_mapping.xml:99
+#, no-c-format
 msgid "Collections of components are supported (eg. an array of type <lite=
ral>Name</literal>). Declare your component collection by replacing the <li=
teral>&lt;element&gt;</literal> tag with a <literal>&lt;composite-element&g=
t;</literal> tag."
 msgstr ""
 =

-#: component_mapping.xml:158(para) =

+#. Tag: programlisting
+#: component_mapping.xml:106
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"someNames\" table=3D\"some_names\" lazy=3D\"=
true\">\n"
+      "    <key column=3D\"id\"/>\n"
+      "    <composite-element class=3D\"eg.Name\"> <!-- class attribute re=
quired -->\n"
+      "        <property name=3D\"initial\"/>\n"
+      "        <property name=3D\"first\"/>\n"
+      "        <property name=3D\"last\"/>\n"
+      "    </composite-element>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:108
+#, no-c-format
 msgid "Note: if you define a <literal>Set</literal> of composite elements,=
 it is very important to implement <literal>equals()</literal> and <literal=
>hashCode()</literal> correctly."
 msgstr ""
 =

-#: component_mapping.xml:164(para) =

+#. Tag: para
+#: component_mapping.xml:114
+#, no-c-format
 msgid "Composite elements may contain components but not collections. If y=
our composite element itself contains components, use the <literal>&lt;nest=
ed-composite-element&gt;</literal> tag. This is a pretty exotic case - a co=
llection of components which themselves have components. By this stage you =
should be asking yourself if a one-to-many association is more appropriate.=
 Try remodelling the composite element as an entity - but note that even th=
ough the Java model is the same, the relational model and persistence seman=
tics are still slightly different."
 msgstr ""
 =

-#: component_mapping.xml:176(para) =

+#. Tag: para
+#: component_mapping.xml:126
+#, no-c-format
 msgid "Please note that a composite element mapping doesn't support null-a=
ble properties if you're using a <literal>&lt;set&gt;</literal>. Hibernate =
has to use each columns value to identify a record when deleting objects (t=
here is no separate primary key column in the composite element table), whi=
ch is not possible with null values. You have to either use only not-null p=
roperties in a composite-element or choose a <literal>&lt;list&gt;</literal=
>, <literal>&lt;map&gt;</literal>, <literal>&lt;bag&gt;</literal> or <liter=
al>&lt;idbag&gt;</literal>."
 msgstr ""
 =

-#: component_mapping.xml:187(para) =

+#. Tag: para
+#: component_mapping.xml:137
+#, no-c-format
 msgid "A special case of a composite element is a composite element with a=
 nested <literal>&lt;many-to-one&gt;</literal> element. A mapping like this=
 allows you to map extra columns of a many-to-many association table to the=
 composite element class. The following is a many-to-many association from =
<literal>Order</literal> to <literal>Item</literal> where <literal>purchase=
Date</literal>, <literal>price</literal> and <literal>quantity</literal> ar=
e properties of the association:"
 msgstr ""
 =

-#: component_mapping.xml:210(para) =

+#. Tag: programlisting
+#: component_mapping.xml:147
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Order\" .... >\n"
+      "    ....\n"
+      "    <set name=3D\"purchasedItems\" table=3D\"purchase_items\" lazy=
=3D\"true\">\n"
+      "        <key column=3D\"order_id\">\n"
+      "        <composite-element class=3D\"eg.Purchase\">\n"
+      "            <property name=3D\"purchaseDate\"/>\n"
+      "            <property name=3D\"price\"/>\n"
+      "            <property name=3D\"quantity\"/>\n"
+      "            <many-to-one name=3D\"item\" class=3D\"eg.Item\"/> <!--=
 class attribute is optional -->\n"
+      "        </composite-element>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:149
+#, no-c-format
 msgid "Of course, there can't be a reference to the purchae on the other s=
ide, for bidirectional association navigation. Remember that components are=
 value types and don't allow shared references. A single <literal>Purchase<=
/literal> can be in the set of an <literal>Order</literal>, but it can't be=
 referenced by the <literal>Item</literal> at the same time."
 msgstr ""
 =

-#: component_mapping.xml:218(para) =

+#. Tag: para
+#: component_mapping.xml:157
+#, no-c-format
 msgid "Even ternary (or quaternary, etc) associations are possible:"
 msgstr ""
 =

-#: component_mapping.xml:231(para) =

+#. Tag: programlisting
+#: component_mapping.xml:159
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Order\" .... >\n"
+      "    ....\n"
+      "    <set name=3D\"purchasedItems\" table=3D\"purchase_items\" lazy=
=3D\"true\">\n"
+      "        <key column=3D\"order_id\">\n"
+      "        <composite-element class=3D\"eg.OrderLine\">\n"
+      "            <many-to-one name=3D\"purchaseDetails class=3D\"eg.Purc=
hase\"/>\n"
+      "            <many-to-one name=3D\"item\" class=3D\"eg.Item\"/>\n"
+      "        </composite-element>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:161
+#, no-c-format
 msgid "Composite elements may appear in queries using the same syntax as a=
ssociations to other entities."
 msgstr ""
 =

-#: component_mapping.xml:239(title) =

+#. Tag: title
+#: component_mapping.xml:169
+#, no-c-format
 msgid "Components as Map indices"
 msgstr ""
 =

-#: component_mapping.xml:241(para) =

+#. Tag: para
+#: component_mapping.xml:171
+#, no-c-format
 msgid "The <literal>&lt;composite-map-key&gt;</literal> element lets you m=
ap a component class as the key of a <literal>Map</literal>. Make sure you =
override <literal>hashCode()</literal> and <literal>equals()</literal> corr=
ectly on the component class."
 msgstr ""
 =

-#: component_mapping.xml:250(title) =

+#. Tag: title
+#: component_mapping.xml:180
+#, no-c-format
 msgid "Components as composite identifiers"
 msgstr ""
 =

-#: component_mapping.xml:252(para) =

+#. Tag: para
+#: component_mapping.xml:182
+#, no-c-format
 msgid "You may use a component as an identifier of an entity class. Your c=
omponent class must satisfy certain requirements:"
 msgstr ""
 =

-#: component_mapping.xml:259(para) =

+#. Tag: para
+#: component_mapping.xml:189
+#, no-c-format
 msgid "It must implement <literal>java.io.Serializable</literal>."
 msgstr ""
 =

-#: component_mapping.xml:264(para) =

+#. Tag: para
+#: component_mapping.xml:194
+#, no-c-format
 msgid "It must re-implement <literal>equals()</literal> and <literal>hashC=
ode()</literal>, consistently with the database's notion of composite key e=
quality."
 msgstr ""
 =

-#: component_mapping.xml:273(emphasis) =

+#. Tag: emphasis
+#: component_mapping.xml:203
+#, no-c-format
 msgid "Note: in Hibernate3, the second requirement is not an absolutely ha=
rd requirement of Hibernate. But do it anyway."
 msgstr ""
 =

-#: component_mapping.xml:277(para) =

+#. Tag: para
+#: component_mapping.xml:207
+#, no-c-format
 msgid "You can't use an <literal>IdentifierGenerator</literal> to generate=
 composite keys. Instead the application must assign its own identifiers."
 msgstr ""
 =

-#: component_mapping.xml:282(para) =

+#. Tag: para
+#: component_mapping.xml:212
+#, no-c-format
 msgid "Use the <literal>&lt;composite-id&gt;</literal> tag (with nested <l=
iteral>&lt;key-property&gt;</literal> elements) in place of the usual <lite=
ral>&lt;id&gt;</literal> declaration. For example, the <literal>OrderLine</=
literal> class has a primary key that depends upon the (composite) primary =
key of <literal>Order</literal>."
 msgstr ""
 =

-#: component_mapping.xml:309(para) =

+#. Tag: programlisting
+#: component_mapping.xml:220
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"OrderLine\">\n"
+      "    \n"
+      "    <composite-id name=3D\"id\" class=3D\"OrderLineId\">\n"
+      "        <key-property name=3D\"lineId\"/>\n"
+      "        <key-property name=3D\"orderId\"/>\n"
+      "        <key-property name=3D\"customerId\"/>\n"
+      "    </composite-id>\n"
+      "    \n"
+      "    <property name=3D\"name\"/>\n"
+      "    \n"
+      "    <many-to-one name=3D\"order\" class=3D\"Order\"\n"
+      "            insert=3D\"false\" update=3D\"false\">\n"
+      "        <column name=3D\"orderId\"/>\n"
+      "        <column name=3D\"customerId\"/>\n"
+      "    </many-to-one>\n"
+      "    ....\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:222
+#, no-c-format
 msgid "Now, any foreign keys referencing the <literal>OrderLine</literal> =
table are also composite. You must declare this in your mappings for other =
classes. An association to <literal>OrderLine</literal> would be mapped lik=
e this:"
 msgstr ""
 =

-#: component_mapping.xml:322(para) =

+#. Tag: programlisting
+#: component_mapping.xml:228
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one name=3D\"orderLine\" class=3D\"OrderLine\">\n"
+      "<!-- the \"class\" attribute is optional, as usual -->\n"
+      "    <column name=3D\"lineId\"/>\n"
+      "    <column name=3D\"orderId\"/>\n"
+      "    <column name=3D\"customerId\"/>\n"
+      "</many-to-one>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:230
+#, no-c-format
 msgid "(Note that the <literal>&lt;column&gt;</literal> tag is an alternat=
ive to the <literal>column</literal> attribute everywhere.)"
 msgstr ""
 =

-#: component_mapping.xml:327(para) =

+#. Tag: para
+#: component_mapping.xml:235
+#, no-c-format
 msgid "A <literal>many-to-many</literal> association to <literal>OrderLine=
</literal> also uses the composite foreign key:"
 msgstr ""
 =

-#: component_mapping.xml:341(para) =

+#. Tag: programlisting
+#: component_mapping.xml:240
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"undeliveredOrderLines\">\n"
+      "    <key column name=3D\"warehouseId\"/>\n"
+      "    <many-to-many class=3D\"OrderLine\">\n"
+      "        <column name=3D\"lineId\"/>\n"
+      "        <column name=3D\"orderId\"/>\n"
+      "        <column name=3D\"customerId\"/>\n"
+      "    </many-to-many>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:242
+#, no-c-format
 msgid "The collection of <literal>OrderLine</literal>s in <literal>Order</=
literal> would use:"
 msgstr ""
 =

-#: component_mapping.xml:354(para) =

+#. Tag: programlisting
+#: component_mapping.xml:247
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"orderLines\" inverse=3D\"true\">\n"
+      "    <key>\n"
+      "        <column name=3D\"orderId\"/>\n"
+      "        <column name=3D\"customerId\"/>\n"
+      "    </key>\n"
+      "    <one-to-many class=3D\"OrderLine\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: component_mapping.xml:249
+#, no-c-format
 msgid "(The <literal>&lt;one-to-many&gt;</literal> element, as usual, decl=
ares no columns.)"
 msgstr ""
 =

-#: component_mapping.xml:358(para) =

+#. Tag: para
+#: component_mapping.xml:253
+#, no-c-format
 msgid "If <literal>OrderLine</literal> itself owns a collection, it also h=
as a composite foreign key."
 msgstr ""
 =

-#: component_mapping.xml:382(title) =

+#. Tag: programlisting
+#: component_mapping.xml:258
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"OrderLine\">\n"
+      "    ....\n"
+      "    ....\n"
+      "    <list name=3D\"deliveryAttempts\">\n"
+      "        <key>   <!-- a collection inherits the composite key type -=
->\n"
+      "            <column name=3D\"lineId\"/>\n"
+      "            <column name=3D\"orderId\"/>\n"
+      "            <column name=3D\"customerId\"/>\n"
+      "        </key>\n"
+      "        <list-index column=3D\"attemptId\" base=3D\"1\"/>\n"
+      "        <composite-element class=3D\"DeliveryAttempt\">\n"
+      "            ...\n"
+      "        </composite-element>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: component_mapping.xml:263
+#, no-c-format
 msgid "Dynamic components"
 msgstr ""
 =

-#: component_mapping.xml:384(para) =

+#. Tag: para
+#: component_mapping.xml:265
+#, no-c-format
 msgid "You may even map a property of type <literal>Map</literal>:"
 msgstr ""
 =

-#: component_mapping.xml:394(para) =

-msgid "The semantics of a <literal>&lt;dynamic-component&gt;</literal> map=
ping are identical to <literal>&lt;component&gt;</literal>. The advantage o=
f this kind of mapping is the ability to determine the actual properties of=
 the bean at deployment time, just by editing the mapping document. Runtime=
 manipulation of the mapping document is also possible, using a DOM parser.=
 Even better, you can access (and change) Hibernate's configuration-time me=
tamodel via the <literal>Configuration</literal> object."
+#. Tag: programlisting
+#: component_mapping.xml:269
+#, no-c-format
+msgid ""
+      "<![CDATA[<dynamic-component name=3D\"userAttributes\">\n"
+      "    <property name=3D\"foo\" column=3D\"FOO\" type=3D\"string\"/>\n"
+      "    <property name=3D\"bar\" column=3D\"BAR\" type=3D\"integer\"/>\=
n"
+      "    <many-to-one name=3D\"baz\" class=3D\"Baz\" column=3D\"BAZ_ID\"=
/>\n"
+      "</dynamic-component>]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: component_mapping.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: component_mapping.xml:271
+#, no-c-format
+msgid "The semantics of a <literal>&lt;dynamic-component&gt;</literal> map=
ping are identical to <literal>&lt;component&gt;</literal>. The advantage o=
f this kind of mapping is the ability to determine the actual properties of=
 the bean at deployment time, just by editing the mapping document. Runtime=
 manipulation of the mapping document is also possible, using a DOM parser.=
 Even better, you can access (and change) Hibernate's configuration-time me=
tamodel via the <literal>Configuration</literal> object."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/conf=
iguration.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/configurat=
ion.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/configurat=
ion.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,1470 +1,2183 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:31-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: configuration.xml:5(title) =

+#. Tag: title
+#: configuration.xml:29
+#, no-c-format
 msgid "Configuration"
 msgstr ""
 =

-#: configuration.xml:7(para) =

+#. Tag: para
+#: configuration.xml:31
+#, no-c-format
 msgid "Because Hibernate is designed to operate in many different environm=
ents, there are a large number of configuration parameters. Fortunately, mo=
st have sensible default values and Hibernate is distributed with an exampl=
e <literal>hibernate.properties</literal> file in <literal>etc/</literal> t=
hat shows the various options. Just put the example file in your classpath =
and customize it."
 msgstr ""
 =

-#: configuration.xml:16(title) =

+#. Tag: title
+#: configuration.xml:40
+#, no-c-format
 msgid "Programmatic configuration"
 msgstr ""
 =

-#: configuration.xml:18(para) =

-msgid "An instance of <literal>org.hibernate.cfg.Configuration</literal> r=
epresents an entire set of mappings of an application's Java types to an SQ=
L database. The <literal>Configuration</literal> is used to build an (immut=
able) <literal>SessionFactory</literal>. The mappings are compiled from var=
ious XML mapping files."
+#. Tag: para
+#: configuration.xml:42
+#, no-c-format
+msgid "An instance of <classname>org.hibernate.cfg.Configuration</classnam=
e> represents an entire set of mappings of an application's Java types to a=
n SQL database. The <classname>org.hibernate.cfg.Configuration</classname> =
is used to build an (immutable) <interfacename>org.hibernate.SessionFactory=
</interfacename>. The mappings are compiled from various XML mapping files."
 msgstr ""
 =

-#: configuration.xml:26(para) =

-msgid "You may obtain a <literal>Configuration</literal> instance by insta=
ntiating it directly and specifying XML mapping documents. If the mapping f=
iles are in the classpath, use <literal>addResource()</literal>:"
+#. Tag: para
+#: configuration.xml:49
+#, no-c-format
+msgid "You may obtain a <classname>org.hibernate.cfg.Configuration</classn=
ame> instance by instantiating it directly and specifying XML mapping docum=
ents. If the mapping files are in the classpath, use <literal>addResource()=
</literal>:"
 msgstr ""
 =

-#: configuration.xml:36(para) =

+#. Tag: programlisting
+#: configuration.xml:55
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D new Configuration()\n"
+      "    .addResource(\"Item.hbm.xml\")\n"
+      "    .addResource(\"Bid.hbm.xml\");]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:57
+#, no-c-format
 msgid "An alternative (sometimes better) way is to specify the mapped clas=
s, and let Hibernate find the mapping document for you:"
 msgstr ""
 =

-#: configuration.xml:45(para) =

-msgid "Then Hibernate will look for mapping files named <literal>/org/hibe=
rnate/auction/Item.hbm.xml</literal> and <literal>/org/hibernate/auction/Bi=
d.hbm.xml</literal> in the classpath. This approach eliminates any hardcode=
d filenames."
+#. Tag: programlisting
+#: configuration.xml:62
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D new Configuration()\n"
+      "    .addClass(org.hibernate.auction.Item.class)\n"
+      "    .addClass(org.hibernate.auction.Bid.class);]]>"
 msgstr ""
 =

-#: configuration.xml:52(para) =

-msgid "A <literal>Configuration</literal> also allows you to specify confi=
guration properties:"
+#. Tag: para
+#: configuration.xml:64
+#, no-c-format
+msgid "Then Hibernate will look for mapping files named <filename>/org/hib=
ernate/auction/Item.hbm.xml</filename> and <filename>/org/hibernate/auction=
/Bid.hbm.xml</filename> in the classpath. This approach eliminates any hard=
coded filenames."
 msgstr ""
 =

-#: configuration.xml:64(para) =

+#. Tag: para
+#: configuration.xml:70
+#, no-c-format
+msgid "A <classname>org.hibernate.cfg.Configuration</classname> also allow=
s you to specify configuration properties:"
+msgstr ""
+
+#. Tag: programlisting
+#: configuration.xml:75
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D new Configuration()\n"
+      "    .addClass(org.hibernate.auction.Item.class)\n"
+      "    .addClass(org.hibernate.auction.Bid.class)\n"
+      "    .setProperty(\"hibernate.dialect\", \"org.hibernate.dialect.MyS=
QLInnoDBDialect\")\n"
+      "    .setProperty(\"hibernate.connection.datasource\", \"java:comp/e=
nv/jdbc/test\")\n"
+      "    .setProperty(\"hibernate.order_updates\", \"true\");]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:77
+#, no-c-format
 msgid "This is not the only way to pass configuration properties to Hibern=
ate. The various options include:"
 msgstr ""
 =

-#: configuration.xml:71(para) =

-msgid "Pass an instance of <literal>java.util.Properties</literal> to <lit=
eral>Configuration.setProperties()</literal>."
+#. Tag: para
+#: configuration.xml:84
+#, no-c-format
+msgid "Pass an instance of <classname>java.util.Properties</classname> to =
<literal>Configuration.setProperties()</literal>."
 msgstr ""
 =

-#: configuration.xml:77(para) =

-msgid "Place <literal>hibernate.properties</literal> in a root directory o=
f the classpath."
+#. Tag: para
+#: configuration.xml:90
+#, no-c-format
+msgid "Place a file named <filename>hibernate.properties</filename> in a r=
oot directory of the classpath."
 msgstr ""
 =

-#: configuration.xml:83(para) =

+#. Tag: para
+#: configuration.xml:95
+#, no-c-format
 msgid "Set <literal>System</literal> properties using <literal>java -Dprop=
erty=3Dvalue</literal>."
 msgstr ""
 =

-#: configuration.xml:89(para) =

+#. Tag: para
+#: configuration.xml:100
+#, no-c-format
 msgid "Include <literal>&lt;property&gt;</literal> elements in <literal>hi=
bernate.cfg.xml</literal> (discussed later)."
 msgstr ""
 =

-#: configuration.xml:96(para) =

-msgid "<literal>hibernate.properties</literal> is the easiest approach if =
you want to get started quickly."
+#. Tag: para
+#: configuration.xml:107
+#, no-c-format
+msgid "<filename>hibernate.properties</filename> is the easiest approach i=
f you want to get started quickly."
 msgstr ""
 =

-#: configuration.xml:101(para) =

-msgid "The <literal>Configuration</literal> is intended as a startup-time =
object, to be discarded once a <literal>SessionFactory</literal> is created=
."
+#. Tag: para
+#: configuration.xml:111
+#, no-c-format
+msgid "The <classname>org.hibernate.cfg.Configuration</classname> is inten=
ded as a startup-time object, to be discarded once a <literal>SessionFactor=
y</literal> is created."
 msgstr ""
 =

-#: configuration.xml:109(title) =

+#. Tag: title
+#: configuration.xml:119
+#, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr ""
 =

-#: configuration.xml:111(para) =

-msgid "When all mappings have been parsed by the <literal>Configuration</l=
iteral>, the application must obtain a factory for <literal>Session</litera=
l> instances. This factory is intended to be shared by all application thre=
ads:"
+#. Tag: para
+#: configuration.xml:121
+#, no-c-format
+msgid "When all mappings have been parsed by the <classname>org.hibernate.=
cfg.Configuration</classname>, the application must obtain a factory for <i=
nterfacename>org.hibernate.Session</interfacename> instances. This factory =
is intended to be shared by all application threads:"
 msgstr ""
 =

-#: configuration.xml:119(para) =

-msgid "Hibernate does allow your application to instantiate more than one =
<literal>SessionFactory</literal>. This is useful if you are using more tha=
n one database."
+#. Tag: programlisting
+#: configuration.xml:127
+#, no-c-format
+msgid "<![CDATA[SessionFactory sessions =3D cfg.buildSessionFactory();]]>"
 msgstr ""
 =

-#: configuration.xml:128(title) =

+#. Tag: para
+#: configuration.xml:129
+#, no-c-format
+msgid "Hibernate does allow your application to instantiate more than one =
<interfacename>org.hibernate.SessionFactory</interfacename>. This is useful=
 if you are using more than one database."
+msgstr ""
+
+#. Tag: title
+#: configuration.xml:138
+#, no-c-format
 msgid "JDBC connections"
 msgstr ""
 =

-#: configuration.xml:130(para) =

-msgid "Usually, you want to have the <literal>SessionFactory</literal> cre=
ate and pool JDBC connections for you. If you take this approach, opening a=
 <literal>Session</literal> is as simple as:"
+#. Tag: para
+#: configuration.xml:140
+#, no-c-format
+msgid "Usually, you want to have the <interfacename>org.hibernate.SessionF=
actory</interfacename> create and pool JDBC connections for you. If you tak=
e this approach, opening a <interfacename>org.hibernate.Session</interfacen=
ame> is as simple as:"
 msgstr ""
 =

-#: configuration.xml:138(para) =

+#. Tag: programlisting
+#: configuration.xml:146
+#, no-c-format
+msgid "<![CDATA[Session session =3D sessions.openSession(); // open a new =
Session]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:148
+#, no-c-format
 msgid "As soon as you do something that requires access to the database, a=
 JDBC connection will be obtained from the pool."
 msgstr ""
 =

-#: configuration.xml:143(para) =

-msgid "For this to work, we need to pass some JDBC connection properties t=
o Hibernate. All Hibernate property names and semantics are defined on the =
class <literal>org.hibernate.cfg.Environment</literal>. We will now describ=
e the most important settings for JDBC connection configuration."
+#. Tag: para
+#: configuration.xml:153
+#, no-c-format
+msgid "For this to work, we need to pass some JDBC connection properties t=
o Hibernate. All Hibernate property names and semantics are defined on the =
class <classname>org.hibernate.cfg.Environment</classname>. We will now des=
cribe the most important settings for JDBC connection configuration."
 msgstr ""
 =

-#: configuration.xml:150(para) =

-msgid "Hibernate will obtain (and pool) connections using <literal>java.sq=
l.DriverManager</literal> if you set the following properties:"
+#. Tag: para
+#: configuration.xml:159
+#, no-c-format
+msgid "Hibernate will obtain (and pool) connections using <classname>java.=
sql.DriverManager</classname> if you set the following properties:"
 msgstr ""
 =

-#: configuration.xml:156(title) =

+#. Tag: title
+#: configuration.xml:165
+#, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr ""
 =

-#: configuration.xml:162(entry) configuration.xml:258(entry) configuration=
.xml:360(entry) configuration.xml:551(entry) configuration.xml:747(entry) c=
onfiguration.xml:854(entry) configuration.xml:942(entry) =

+#. Tag: entry
+#: configuration.xml:171 configuration.xml:257 configuration.xml:353 confi=
guration.xml:548 configuration.xml:743 configuration.xml:850 configuration.=
xml:938
+#, no-c-format
 msgid "Property name"
 msgstr ""
 =

-#: configuration.xml:163(entry) configuration.xml:259(entry) configuration=
.xml:361(entry) configuration.xml:552(entry) configuration.xml:748(entry) c=
onfiguration.xml:855(entry) configuration.xml:943(entry) =

+#. Tag: entry
+#: configuration.xml:172 configuration.xml:258 configuration.xml:354 confi=
guration.xml:549 configuration.xml:744 configuration.xml:851 configuration.=
xml:939
+#, no-c-format
 msgid "Purpose"
 msgstr ""
 =

-#: configuration.xml:169(literal) =

+#. Tag: property
+#: configuration.xml:178
+#, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr ""
 =

-#: configuration.xml:172(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:181
+#, no-c-format
 msgid "JDBC driver class"
 msgstr ""
 =

-#: configuration.xml:177(literal) =

+#. Tag: property
+#: configuration.xml:186
+#, no-c-format
 msgid "hibernate.connection.url"
 msgstr ""
 =

-#: configuration.xml:180(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:189
+#, no-c-format
 msgid "JDBC URL"
 msgstr ""
 =

-#: configuration.xml:185(literal) configuration.xml:289(literal) =

+#. Tag: property
+#: configuration.xml:194 configuration.xml:288
+#, no-c-format
 msgid "hibernate.connection.username"
 msgstr ""
 =

-#: configuration.xml:188(emphasis) configuration.xml:292(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:197
+#, no-c-format
 msgid "database user"
 msgstr ""
 =

-#: configuration.xml:193(literal) configuration.xml:297(literal) =

+#. Tag: property
+#: configuration.xml:202 configuration.xml:296
+#, no-c-format
 msgid "hibernate.connection.password"
 msgstr ""
 =

-#: configuration.xml:196(emphasis) configuration.xml:300(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:205
+#, no-c-format
 msgid "database user password"
 msgstr ""
 =

-#: configuration.xml:201(literal) =

+#. Tag: property
+#: configuration.xml:210
+#, no-c-format
 msgid "hibernate.connection.pool_size"
 msgstr ""
 =

-#: configuration.xml:204(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:213
+#, no-c-format
 msgid "maximum number of pooled connections"
 msgstr ""
 =

-#: configuration.xml:211(para) =

-msgid "Hibernate's own connection pooling algorithm is however quite rudim=
entary. It is intended to help you get started and is <emphasis>not intende=
d for use in a production system</emphasis> or even for performance testing=
. You should use a third party pool for best performance and stability. Jus=
t replace the <literal>hibernate.connection.pool_size</literal> property wi=
th connection pool specific settings. This will turn off Hibernate's intern=
al pool. For example, you might like to use C3P0."
+#. Tag: para
+#: configuration.xml:220
+#, no-c-format
+msgid "Hibernate's own connection pooling algorithm is however quite rudim=
entary. It is intended to help you get started and is <emphasis>not intende=
d for use in a production system</emphasis> or even for performance testing=
. You should use a third party pool for best performance and stability. Jus=
t replace the <property>hibernate.connection.pool_size</property> property =
with connection pool specific settings. This will turn off Hibernate's inte=
rnal pool. For example, you might like to use C3P0."
 msgstr ""
 =

-#: configuration.xml:221(para) =

-msgid "C3P0 is an open source JDBC connection pool distributed along with =
Hibernate in the <literal>lib</literal> directory. Hibernate will use its <=
literal>C3P0ConnectionProvider</literal> for connection pooling if you set =
<literal>hibernate.c3p0.*</literal> properties. If you'd like to use Proxoo=
l refer to the packaged <literal>hibernate.properties</literal> and the Hib=
ernate web site for more information."
+#. Tag: para
+#: configuration.xml:230
+#, no-c-format
+msgid "C3P0 is an open source JDBC connection pool distributed along with =
Hibernate in the <filename>lib</filename> directory. Hibernate will use its=
 <classname>org.hibernate.connection.C3P0ConnectionProvider</classname> for=
 connection pooling if you set <property>hibernate.c3p0.*</property> proper=
ties. If you'd like to use Proxool refer to the packaged <filename>hibernat=
e.properties</filename> and the Hibernate web site for more information."
 msgstr ""
 =

-#: configuration.xml:230(para) =

-msgid "Here is an example <literal>hibernate.properties</literal> file for=
 C3P0:"
+#. Tag: para
+#: configuration.xml:238
+#, no-c-format
+msgid "Here is an example <filename>hibernate.properties</filename> file f=
or C3P0:"
 msgstr ""
 =

-#: configuration.xml:244(para) =

-msgid "For use inside an application server, you should almost always conf=
igure Hibernate to obtain connections from an application server <literal>D=
atasource</literal> registered in JNDI. You'll need to set at least one of =
the following properties:"
+#. Tag: programlisting
+#: configuration.xml:242
+#, no-c-format
+msgid ""
+      "<![CDATA[hibernate.connection.driver_class =3D org.postgresql.Drive=
r\n"
+      "hibernate.connection.url =3D jdbc:postgresql://localhost/mydatabase=
\n"
+      "hibernate.connection.username =3D myuser\n"
+      "hibernate.connection.password =3D secret\n"
+      "hibernate.c3p0.min_size=3D5\n"
+      "hibernate.c3p0.max_size=3D20\n"
+      "hibernate.c3p0.timeout=3D1800\n"
+      "hibernate.c3p0.max_statements=3D50\n"
+      "hibernate.dialect =3D org.hibernate.dialect.PostgreSQLDialect]]>"
 msgstr ""
 =

-#: configuration.xml:252(title) =

+#. Tag: para
+#: configuration.xml:244
+#, no-c-format
+msgid "For use inside an application server, you should almost always conf=
igure Hibernate to obtain connections from an application server <interface=
name>javax.sql.Datasource</interfacename> registered in JNDI. You'll need t=
o set at least one of the following properties:"
+msgstr ""
+
+#. Tag: title
+#: configuration.xml:251
+#, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr ""
 =

-#: configuration.xml:265(literal) =

+#. Tag: property
+#: configuration.xml:264
+#, no-c-format
 msgid "hibernate.connection.datasource"
 msgstr ""
 =

-#: configuration.xml:268(emphasis) =

+#. Tag: emphasis
+#: configuration.xml:267
+#, no-c-format
 msgid "datasource JNDI name"
 msgstr ""
 =

-#: configuration.xml:273(literal) =

+#. Tag: property
+#: configuration.xml:272
+#, no-c-format
 msgid "hibernate.jndi.url"
 msgstr ""
 =

-#: configuration.xml:276(emphasis) =

-msgid "URL of the JNDI provider"
+#. Tag: entry
+#: configuration.xml:274
+#, no-c-format
+msgid "<emphasis>URL of the JNDI provider</emphasis> (optional)"
 msgstr ""
 =

-#: configuration.xml:275(entry) configuration.xml:283(entry) configuration=
.xml:291(entry) configuration.xml:299(entry) =

-msgid "<placeholder-1/> (optional)"
+#. Tag: property
+#: configuration.xml:280
+#, no-c-format
+msgid "hibernate.jndi.class"
 msgstr ""
 =

-#: configuration.xml:281(literal) =

-msgid "hibernate.jndi.class"
+#. Tag: entry
+#: configuration.xml:282
+#, no-c-format
+msgid "<emphasis>class of the JNDI <literal>InitialContextFactory</literal=
></emphasis> (optional)"
 msgstr ""
 =

-#: configuration.xml:284(literal) configuration.xml:733(literal) =

-msgid "InitialContextFactory"
+#. Tag: entry
+#: configuration.xml:290
+#, no-c-format
+msgid "<emphasis>database user</emphasis> (optional)"
 msgstr ""
 =

-#: configuration.xml:284(emphasis) =

-msgid "class of the JNDI <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:298
+#, no-c-format
+msgid "<emphasis>database user password</emphasis> (optional)"
 msgstr ""
 =

-#: configuration.xml:307(para) =

-msgid "Here's an example <literal>hibernate.properties</literal> file for =
an application server provided JNDI datasource:"
+#. Tag: para
+#: configuration.xml:306
+#, no-c-format
+msgid "Here's an example <filename>hibernate.properties</filename> file fo=
r an application server provided JNDI datasource:"
 msgstr ""
 =

-#: configuration.xml:319(para) =

+#. Tag: programlisting
+#: configuration.xml:311
+#, no-c-format
+msgid ""
+      "<![CDATA[hibernate.connection.datasource =3D java:/comp/env/jdbc/te=
st\n"
+      "hibernate.transaction.factory_class =3D \\\n"
+      "    org.hibernate.transaction.JTATransactionFactory\n"
+      "hibernate.transaction.manager_lookup_class =3D \\\n"
+      "    org.hibernate.transaction.JBossTransactionManagerLookup\n"
+      "hibernate.dialect =3D org.hibernate.dialect.PostgreSQLDialect]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:313
+#, no-c-format
 msgid "JDBC connections obtained from a JNDI datasource will automatically=
 participate in the container-managed transactions of the application serve=
r."
 msgstr ""
 =

-#: configuration.xml:324(para) =

-msgid "Arbitrary connection properties may be given by prepending \"<liter=
al>hibernate.connection</literal>\" to the property name. For example, you =
may specify a <literal>charSet</literal> using <literal>hibernate.connectio=
n.charSet</literal>."
+#. Tag: para
+#: configuration.xml:318
+#, no-c-format
+msgid "Arbitrary connection properties may be given by prepending \"<liter=
al>hibernate.connection</literal>\" to the connection property name. For ex=
ample, you may specify a <property>charSet</property> connection property u=
sing <property>hibernate.connection.charSet</property>."
 msgstr ""
 =

-#: configuration.xml:330(para) =

-msgid "You may define your own plugin strategy for obtaining JDBC connecti=
ons by implementing the interface <literal>org.hibernate.connection.Connect=
ionProvider</literal>. You may select a custom implementation by setting <l=
iteral>hibernate.connection.provider_class</literal>."
+#. Tag: para
+#: configuration.xml:324
+#, no-c-format
+msgid "You may define your own plugin strategy for obtaining JDBC connecti=
ons by implementing the interface <interfacename>org.hibernate.connection.C=
onnectionProvider</interfacename>, and specifying your custom implementatio=
n via the <property>hibernate.connection.provider_class</property> property=
."
 msgstr ""
 =

-#: configuration.xml:339(title) =

+#. Tag: title
+#: configuration.xml:333
+#, no-c-format
 msgid "Optional configuration properties"
 msgstr ""
 =

-#: configuration.xml:341(para) =

+#. Tag: para
+#: configuration.xml:335
+#, no-c-format
 msgid "There are a number of other properties that control the behaviour o=
f Hibernate at runtime. All are optional and have reasonable default values=
."
 msgstr ""
 =

-#: configuration.xml:346(para) =

-msgid "<emphasis>Warning: some of these properties are \"system-level\" on=
ly.</emphasis> System-level properties can be set only via <literal>java -D=
property=3Dvalue</literal> or <literal>hibernate.properties</literal>. They=
 may <emphasis>not</emphasis> be set by the other techniques described abov=
e."
+#. Tag: para
+#: configuration.xml:340
+#, no-c-format
+msgid "<emphasis>Warning: some of these properties are \"system-level\" on=
ly.</emphasis> System-level properties can be set only via <literal>java -D=
property=3Dvalue</literal> or <filename>hibernate.properties</filename>. Th=
ey may <emphasis>not</emphasis> be set by the other techniques described ab=
ove."
 msgstr ""
 =

-#: configuration.xml:354(title) =

+#. Tag: title
+#: configuration.xml:347
+#, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr ""
 =

-#: configuration.xml:367(literal) =

+#. Tag: property
+#: configuration.xml:360
+#, no-c-format
 msgid "hibernate.dialect"
 msgstr ""
 =

-#: configuration.xml:370(literal) configuration.xml:1045(entry) =

-msgid "Dialect"
+#. Tag: entry
+#: configuration.xml:362
+#, no-c-format
+msgid "The classname of a Hibernate <classname>org.hibernate.dialect.Diale=
ct</classname> which allows Hibernate to generate SQL optimized for a parti=
cular relational database."
 msgstr ""
 =

-#: configuration.xml:374(emphasis) configuration.xml:413(emphasis) configu=
ration.xml:426(emphasis) configuration.xml:439(emphasis) configuration.xml:=
600(emphasis) configuration.xml:644(emphasis) configuration.xml:657(emphasi=
s) configuration.xml:671(emphasis) configuration.xml:759(emphasis) configur=
ation.xml:774(emphasis) configuration.xml:786(emphasis) configuration.xml:8=
00(emphasis) configuration.xml:813(emphasis) configuration.xml:825(emphasis=
) configuration.xml:838(emphasis) configuration.xml:868(emphasis) configura=
tion.xml:882(emphasis) configuration.xml:896(emphasis) configuration.xml:98=
4(emphasis) =

-msgid "eg."
+#. Tag: para
+#: configuration.xml:365
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>full.classname.=
of.Dialect</literal>"
 msgstr ""
 =

-#: configuration.xml:375(literal) =

-msgid "full.classname.of.Dialect"
+#. Tag: para
+#: configuration.xml:369
+#, no-c-format
+msgid "In most cases Hibernate will actually be able to chose the correct =
<classname>org.hibernate.dialect.Dialect</classname> implementation to use =
based on the <literal>JDBC metadata</literal> returned by the JDBC driver."
 msgstr ""
 =

-#: configuration.xml:369(entry) =

-msgid "The classname of a Hibernate <placeholder-1/> which allows Hibernat=
e to generate SQL optimized for a particular relational database. <placehol=
der-2/>"
-msgstr ""
-
-#: configuration.xml:381(literal) =

+#. Tag: property
+#: configuration.xml:378
+#, no-c-format
 msgid "hibernate.show_sql"
 msgstr ""
 =

-#: configuration.xml:385(literal) configuration.xml:1247(literal) =

-msgid "org.hibernate.SQL"
+#. Tag: entry
+#: configuration.xml:380
+#, no-c-format
+msgid "Write all SQL statements to console. This is an alternative to sett=
ing the log category <literal>org.hibernate.SQL</literal> to <literal>debug=
</literal>."
 msgstr ""
 =

-#: configuration.xml:386(literal) =

-msgid "debug"
+#. Tag: para
+#: configuration.xml:384 configuration.xml:396 configuration.xml:490 confi=
guration.xml:503 configuration.xml:516 configuration.xml:529 configuration.=
xml:583 configuration.xml:610 configuration.xml:623 configuration.xml:678 c=
onfiguration.xml:906 configuration.xml:921 configuration.xml:1011
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>true</literal> =
| <literal>false</literal>"
 msgstr ""
 =

-#: configuration.xml:387(para) configuration.xml:399(para) configuration.x=
ml:493(para) configuration.xml:506(para) configuration.xml:519(para) config=
uration.xml:532(para) configuration.xml:586(para) configuration.xml:613(par=
a) configuration.xml:627(para) configuration.xml:682(para) configuration.xm=
l:910(para) configuration.xml:925(para) configuration.xml:1015(para) =

-msgid "<emphasis role=3D\"strong\">eg.</emphasis><literal>true</literal> |=
 <literal>false</literal>"
-msgstr ""
-
-#: configuration.xml:383(entry) =

-msgid "Write all SQL statements to console. This is an alternative to sett=
ing the log category <placeholder-1/> to <placeholder-2/>. <placeholder-3/>"
-msgstr ""
-
-#: configuration.xml:395(literal) =

+#. Tag: property
+#: configuration.xml:392
+#, no-c-format
 msgid "hibernate.format_sql"
 msgstr ""
 =

-#: configuration.xml:397(entry) =

-msgid "Pretty print the SQL in the log and console. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:394
+#, no-c-format
+msgid "Pretty print the SQL in the log and console."
 msgstr ""
 =

-#: configuration.xml:407(literal) =

+#. Tag: property
+#: configuration.xml:404
+#, no-c-format
 msgid "hibernate.default_schema"
 msgstr ""
 =

-#: configuration.xml:414(literal) =

-msgid "SCHEMA_NAME"
+#. Tag: entry
+#: configuration.xml:406
+#, no-c-format
+msgid "Qualify unqualified table names with the given schema/tablespace in=
 generated SQL."
 msgstr ""
 =

-#: configuration.xml:409(entry) =

-msgid "Qualify unqualified table names with the given schema/tablespace in=
 generated SQL. <placeholder-1/>"
+#. Tag: para
+#: configuration.xml:409
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</li=
teral>"
 msgstr ""
 =

-#: configuration.xml:420(literal) =

+#. Tag: property
+#: configuration.xml:417
+#, no-c-format
 msgid "hibernate.default_catalog"
 msgstr ""
 =

-#: configuration.xml:427(literal) =

-msgid "CATALOG_NAME"
+#. Tag: entry
+#: configuration.xml:419
+#, no-c-format
+msgid "Qualify unqualified table names with the given catalog in generated=
 SQL."
 msgstr ""
 =

-#: configuration.xml:422(entry) =

-msgid "Qualify unqualified table names with the given catalog in generated=
 SQL. <placeholder-1/>"
+#. Tag: para
+#: configuration.xml:422
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>CATALOG_NAME</l=
iteral>"
 msgstr ""
 =

-#: configuration.xml:433(literal) =

+#. Tag: property
+#: configuration.xml:430
+#, no-c-format
 msgid "hibernate.session_factory_name"
 msgstr ""
 =

-#: configuration.xml:436(literal) configuration.xml:478(literal) configura=
tion.xml:995(literal) configuration.xml:997(literal) =

-msgid "SessionFactory"
+#. Tag: entry
+#: configuration.xml:432
+#, no-c-format
+msgid "The <interfacename>org.hibernate.SessionFactory</interfacename> wil=
l be automatically bound to this name in JNDI after it has been created."
 msgstr ""
 =

-#: configuration.xml:440(literal) configuration.xml:883(literal) =

-msgid "jndi/composite/name"
+#. Tag: para
+#: configuration.xml:435 configuration.xml:877
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>jndi/composite/=
name</literal>"
 msgstr ""
 =

-#: configuration.xml:435(entry) =

-msgid "The <placeholder-1/> will be automatically bound to this name in JN=
DI after it has been created. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:446(literal) =

+#. Tag: property
+#: configuration.xml:443
+#, no-c-format
 msgid "hibernate.max_fetch_depth"
 msgstr ""
 =

-#: configuration.xml:451(literal) =

-msgid "0"
+#. Tag: entry
+#: configuration.xml:445
+#, no-c-format
+msgid "Set a maximum \"depth\" for the outer join fetch tree for single-en=
ded associations (one-to-one, many-to-one). A <literal>0</literal> disables=
 default outer join fetching."
 msgstr ""
 =

-#: configuration.xml:452(para) =

+#. Tag: para
+#: configuration.xml:449
+#, no-c-format
 msgid "<emphasis role=3D\"strong\">eg.</emphasis> recommended values betwe=
en <literal>0</literal> and <literal>3</literal>"
 msgstr ""
 =

-#: configuration.xml:448(entry) =

-msgid "Set a maximum \"depth\" for the outer join fetch tree for single-en=
ded associations (one-to-one, many-to-one). A <placeholder-1/> disables def=
ault outer join fetching. <placeholder-2/>"
+#. Tag: property
+#: configuration.xml:458
+#, no-c-format
+msgid "hibernate.default_batch_fetch_size"
 msgstr ""
 =

-#: configuration.xml:461(literal) =

-msgid "hibernate.default_batch_fetch_size"
+#. Tag: entry
+#: configuration.xml:460
+#, no-c-format
+msgid "Set a default size for Hibernate batch fetching of associations."
 msgstr ""
 =

-#: configuration.xml:465(para) =

+#. Tag: para
+#: configuration.xml:462
+#, no-c-format
 msgid "<emphasis role=3D\"strong\">eg.</emphasis> recommended values <lite=
ral>4</literal>, <literal>8</literal>, <literal>16</literal>"
 msgstr ""
 =

-#: configuration.xml:463(entry) =

-msgid "Set a default size for Hibernate batch fetching of associations. <p=
laceholder-1/>"
+#. Tag: property
+#: configuration.xml:471
+#, no-c-format
+msgid "hibernate.default_entity_mode"
 msgstr ""
 =

-#: configuration.xml:474(literal) =

-msgid "hibernate.default_entity_mode"
+#. Tag: entry
+#: configuration.xml:473
+#, no-c-format
+msgid "Set a default mode for entity representation for all sessions opene=
d from this <literal>SessionFactory</literal>"
 msgstr ""
 =

-#: configuration.xml:479(para) =

+#. Tag: para
+#: configuration.xml:476
+#, no-c-format
 msgid "<literal>dynamic-map</literal>, <literal>dom4j</literal>, <literal>=
pojo</literal>"
 msgstr ""
 =

-#: configuration.xml:476(entry) =

-msgid "Set a default mode for entity representation for all sessions opene=
d from this <placeholder-1/><placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:487(literal) =

+#. Tag: property
+#: configuration.xml:484
+#, no-c-format
 msgid "hibernate.order_updates"
 msgstr ""
 =

-#: configuration.xml:489(entry) =

-msgid "Force Hibernate to order SQL updates by the primary key value of th=
e items being updated. This will result in fewer transaction deadlocks in h=
ighly concurrent systems. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:486
+#, no-c-format
+msgid "Force Hibernate to order SQL updates by the primary key value of th=
e items being updated. This will result in fewer transaction deadlocks in h=
ighly concurrent systems."
 msgstr ""
 =

-#: configuration.xml:501(literal) =

+#. Tag: property
+#: configuration.xml:498
+#, no-c-format
 msgid "hibernate.generate_statistics"
 msgstr ""
 =

-#: configuration.xml:503(entry) =

-msgid "If enabled, Hibernate will collect statistics useful for performanc=
e tuning. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:500
+#, no-c-format
+msgid "If enabled, Hibernate will collect statistics useful for performanc=
e tuning."
 msgstr ""
 =

-#: configuration.xml:514(literal) =

+#. Tag: property
+#: configuration.xml:511
+#, no-c-format
 msgid "hibernate.use_identifier_rollback"
 msgstr ""
 =

-#: configuration.xml:516(entry) =

-msgid "If enabled, generated identifier properties will be reset to defaul=
t values when objects are deleted. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:513
+#, no-c-format
+msgid "If enabled, generated identifier properties will be reset to defaul=
t values when objects are deleted."
 msgstr ""
 =

-#: configuration.xml:527(literal) =

+#. Tag: property
+#: configuration.xml:524
+#, no-c-format
 msgid "hibernate.use_sql_comments"
 msgstr ""
 =

-#: configuration.xml:531(literal) configuration.xml:585(literal) =

-msgid "false"
+#. Tag: entry
+#: configuration.xml:526
+#, no-c-format
+msgid "If turned on, Hibernate will generate comments inside the SQL, for =
easier debugging, defaults to <literal>false</literal>."
 msgstr ""
 =

-#: configuration.xml:529(entry) =

-msgid "If turned on, Hibernate will generate comments inside the SQL, for =
easier debugging, defaults to <placeholder-1/>. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:543(title) =

+#. Tag: title
+#: configuration.xml:540
+#, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr ""
 =

-#: configuration.xml:558(literal) =

+#. Tag: property
+#: configuration.xml:555
+#, no-c-format
 msgid "hibernate.jdbc.fetch_size"
 msgstr ""
 =

-#: configuration.xml:562(literal) =

-msgid "Statement.setFetchSize()"
+#. Tag: entry
+#: configuration.xml:557
+#, no-c-format
+msgid "A non-zero value determines the JDBC fetch size (calls <literal>Sta=
tement.setFetchSize()</literal>)."
 msgstr ""
 =

-#: configuration.xml:560(entry) =

-msgid "A non-zero value determines the JDBC fetch size (calls <placeholder=
-1/>)."
+#. Tag: property
+#: configuration.xml:564
+#, no-c-format
+msgid "hibernate.jdbc.batch_size"
 msgstr ""
 =

-#: configuration.xml:567(literal) =

-msgid "hibernate.jdbc.batch_size"
+#. Tag: entry
+#: configuration.xml:566
+#, no-c-format
+msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate."
 msgstr ""
 =

-#: configuration.xml:571(para) =

+#. Tag: para
+#: configuration.xml:568
+#, no-c-format
 msgid "<emphasis role=3D\"strong\">eg.</emphasis> recommended values betwe=
en <literal>5</literal> and <literal>30</literal>"
 msgstr ""
 =

-#: configuration.xml:569(entry) =

-msgid "A non-zero value enables use of JDBC2 batch updates by Hibernate. <=
placeholder-1/>"
-msgstr ""
-
-#: configuration.xml:579(literal) =

+#. Tag: property
+#: configuration.xml:576
+#, no-c-format
 msgid "hibernate.jdbc.batch_versioned_data"
 msgstr ""
 =

-#: configuration.xml:582(literal) =

-msgid "true"
+#. Tag: entry
+#: configuration.xml:578
+#, no-c-format
+msgid "Set this property to <literal>true</literal> if your JDBC driver re=
turns correct row counts from <literal>executeBatch()</literal> (it is usua=
lly safe to turn this option on). Hibernate will then use batched DML for a=
utomatically versioned data. Defaults to <literal>false</literal>."
 msgstr ""
 =

-#: configuration.xml:583(literal) =

-msgid "executeBatch()"
-msgstr ""
-
-#: configuration.xml:581(entry) =

-msgid "Set this property to <placeholder-1/> if your JDBC driver returns c=
orrect row counts from <placeholder-2/> (it is usually safe to turn this op=
tion on). Hibernate will then use batched DML for automatically versioned d=
ata. Defaults to <placeholder-3/>. <placeholder-4/>"
-msgstr ""
-
-#: configuration.xml:594(literal) =

+#. Tag: property
+#: configuration.xml:591
+#, no-c-format
 msgid "hibernate.jdbc.factory_class"
 msgstr ""
 =

-#: configuration.xml:597(literal) =

-msgid "Batcher"
+#. Tag: entry
+#: configuration.xml:593
+#, no-c-format
+msgid "Select a custom <interfacename>org.hibernate.jdbc.Batcher</interfac=
ename>. Most applications will not need this configuration property."
 msgstr ""
 =

-#: configuration.xml:601(literal) =

-msgid "classname.of.BatcherFactory"
+#. Tag: para
+#: configuration.xml:596
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Ba=
tcherFactory</literal>"
 msgstr ""
 =

-#: configuration.xml:596(entry) =

-msgid "Select a custom <placeholder-1/>. Most applications will not need t=
his configuration property. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:607(literal) =

+#. Tag: property
+#: configuration.xml:604
+#, no-c-format
 msgid "hibernate.jdbc.use_scrollable_resultset"
 msgstr ""
 =

-#: configuration.xml:609(entry) =

-msgid "Enables use of JDBC2 scrollable resultsets by Hibernate. This prope=
rty is only necessary when using user supplied JDBC connections, Hibernate =
uses connection metadata otherwise. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:606
+#, no-c-format
+msgid "Enables use of JDBC2 scrollable resultsets by Hibernate. This prope=
rty is only necessary when using user supplied JDBC connections, Hibernate =
uses connection metadata otherwise."
 msgstr ""
 =

-#: configuration.xml:621(literal) =

+#. Tag: property
+#: configuration.xml:618
+#, no-c-format
 msgid "hibernate.jdbc.use_streams_for_binary"
 msgstr ""
 =

-#: configuration.xml:624(literal) =

-msgid "binary"
+#. Tag: entry
+#: configuration.xml:620
+#, no-c-format
+msgid "Use streams when writing/reading <literal>binary</literal> or <lite=
ral>serializable</literal> types to/from JDBC. <emphasis>*system-level prop=
erty*</emphasis>"
 msgstr ""
 =

-#: configuration.xml:625(literal) =

-msgid "serializable"
-msgstr ""
-
-#: configuration.xml:623(entry) =

-msgid "Use streams when writing/reading <placeholder-1/> or <placeholder-2=
/> types to/from JDBC (system-level property). <placeholder-3/>"
-msgstr ""
-
-#: configuration.xml:635(literal) =

+#. Tag: property
+#: configuration.xml:631
+#, no-c-format
 msgid "hibernate.jdbc.use_get_generated_keys"
 msgstr ""
 =

-#: configuration.xml:638(literal) =

-msgid "PreparedStatement.getGeneratedKeys()"
+#. Tag: entry
+#: configuration.xml:633
+#, no-c-format
+msgid "Enable use of JDBC3 <literal>PreparedStatement.getGeneratedKeys()</=
literal> to retrieve natively generated keys after insert. Requires JDBC3+ =
driver and JRE1.4+, set to false if your driver has problems with the Hiber=
nate identifier generators. By default, tries to determine the driver capab=
ilities using connection metadata."
 msgstr ""
 =

-#: configuration.xml:645(literal) configuration.xml:775(literal) configura=
tion.xml:787(literal) configuration.xml:801(literal) configuration.xml:839(=
literal) =

-msgid "true|false"
+#. Tag: para
+#: configuration.xml:639 configuration.xml:769 configuration.xml:781 confi=
guration.xml:795 configuration.xml:833
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>true|false</lit=
eral>"
 msgstr ""
 =

-#: configuration.xml:637(entry) =

-msgid "Enable use of JDBC3 <placeholder-1/> to retrieve natively generated=
 keys after insert. Requires JDBC3+ driver and JRE1.4+, set to false if you=
r driver has problems with the Hibernate identifier generators. By default,=
 tries to determine the driver capabilities using connection metadata. <pla=
ceholder-2/>"
-msgstr ""
-
-#: configuration.xml:651(literal) =

+#. Tag: property
+#: configuration.xml:647
+#, no-c-format
 msgid "hibernate.connection.provider_class"
 msgstr ""
 =

-#: configuration.xml:654(literal) =

-msgid "ConnectionProvider"
+#. Tag: entry
+#: configuration.xml:649
+#, no-c-format
+msgid "The classname of a custom <interfacename>org.hibernate.connection.C=
onnectionProvider</interfacename> which provides JDBC connections to Hibern=
ate."
 msgstr ""
 =

-#: configuration.xml:658(literal) =

-msgid "classname.of.ConnectionProvider"
+#. Tag: para
+#: configuration.xml:652
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Co=
nnectionProvider</literal>"
 msgstr ""
 =

-#: configuration.xml:653(entry) =

-msgid "The classname of a custom <placeholder-1/> which provides JDBC conn=
ections to Hibernate. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:664(literal) =

+#. Tag: property
+#: configuration.xml:660
+#, no-c-format
 msgid "hibernate.connection.isolation"
 msgstr ""
 =

-#: configuration.xml:668(literal) =

-msgid "java.sql.Connection"
+#. Tag: entry
+#: configuration.xml:662
+#, no-c-format
+msgid "Set the JDBC transaction isolation level. Check <interfacename>java=
.sql.Connection</interfacename> for meaningful values but note that most da=
tabases do not support all isolation levels and some define additional, non=
-standard isolations."
 msgstr ""
 =

-#: configuration.xml:672(literal) =

-msgid "1, 2, 4, 8"
+#. Tag: para
+#: configuration.xml:666
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>1, 2, 4, 8</lit=
eral>"
 msgstr ""
 =

-#: configuration.xml:666(entry) =

-msgid "Set the JDBC transaction isolation level. Check <placeholder-1/> fo=
r meaningful values but note that most databases do not support all isolati=
on levels. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:678(literal) =

+#. Tag: property
+#: configuration.xml:674
+#, no-c-format
 msgid "hibernate.connection.autocommit"
 msgstr ""
 =

-#: configuration.xml:680(entry) =

-msgid "Enables autocommit for JDBC pooled connections (not recommended). <=
placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:676
+#, no-c-format
+msgid "Enables autocommit for JDBC pooled connections (not recommended)."
 msgstr ""
 =

-#: configuration.xml:690(literal) =

+#. Tag: property
+#: configuration.xml:686
+#, no-c-format
 msgid "hibernate.connection.release_mode"
 msgstr ""
 =

-#: configuration.xml:696(literal) configuration.xml:700(literal) =

-msgid "after_statement"
+#. Tag: entry
+#: configuration.xml:688
+#, no-c-format
+msgid "Specify when Hibernate should release JDBC connections. By default,=
 a JDBC connection is held until the session is explicitly closed or discon=
nected. For an application server JTA datasource, you should use <literal>a=
fter_statement</literal> to aggressively release connections after every JD=
BC call. For a non-JTA connection, it often makes sense to release the conn=
ection at the end of each transaction, by using <literal>after_transaction<=
/literal>. <literal>auto</literal> will choose <literal>after_statement</li=
teral> for the JTA and CMT transaction strategies and <literal>after_transa=
ction</literal> for the JDBC transaction strategy."
 msgstr ""
 =

-#: configuration.xml:699(literal) configuration.xml:701(literal) =

-msgid "after_transaction"
+#. Tag: para
+#: configuration.xml:699
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>auto</literal> =
(default) | <literal>on_close</literal> | <literal>after_transaction</liter=
al> | <literal>after_statement</literal>"
 msgstr ""
 =

-#: configuration.xml:699(literal) =

-msgid "auto"
+#. Tag: para
+#: configuration.xml:704
+#, no-c-format
+msgid "Note that this setting only affects <literal>Session</literal>s ret=
urned from <literal>SessionFactory.openSession</literal>. For <literal>Sess=
ion</literal>s obtained through <literal>SessionFactory.getCurrentSession</=
literal>, the <literal>CurrentSessionContext</literal> implementation confi=
gured for use controls the connection release mode for those <literal>Sessi=
on</literal>s. See"
 msgstr ""
 =

-#: configuration.xml:703(para) =

-msgid "<emphasis role=3D\"strong\">eg.</emphasis><literal>auto</literal> (=
default) | <literal>on_close</literal> | <literal>after_transaction</litera=
l> | <literal>after_statement</literal>"
+#. Tag: entry
+#: configuration.xml:715
+#, no-c-format
+msgid "<property>hibernate.connection.</property><emphasis>&lt;propertyNam=
e&gt;</emphasis>"
 msgstr ""
 =

-#: configuration.xml:708(para) =

-msgid "Note that this setting only affects <literal>Session</literal>s ret=
urned from <literal>SessionFactory.openSession</literal>. For <literal>Sess=
ion</literal>s obtained through <literal>SessionFactory.getCurrentSession</=
literal>, the <literal>CurrentSessionContext</literal> implementation confi=
gured for use controls the connection release mode for those <literal>Sessi=
on</literal>s. See <xref linkend=3D\"architecture-current-session\"/>"
+#. Tag: entry
+#: configuration.xml:718
+#, no-c-format
+msgid "Pass the JDBC property <emphasis>&lt;propertyName&gt;</emphasis> to=
 <literal>DriverManager.getConnection()</literal>."
 msgstr ""
 =

-#: configuration.xml:692(entry) =

-msgid "Specify when Hibernate should release JDBC connections. By default,=
 a JDBC connection is held until the session is explicitly closed or discon=
nected. For an application server JTA datasource, you should use <placehold=
er-1/> to aggressively release connections after every JDBC call. For a non=
-JTA connection, it often makes sense to release the connection at the end =
of each transaction, by using <placeholder-2/>. <placeholder-3/> will choos=
e <placeholder-4/> for the JTA and CMT transaction strategies and <placehol=
der-5/> for the JDBC transaction strategy. <placeholder-6/><placeholder-7/>"
+#. Tag: entry
+#: configuration.xml:724
+#, no-c-format
+msgid "<property>hibernate.jndi.</property><emphasis>&lt;propertyName&gt;<=
/emphasis>"
 msgstr ""
 =

-#: configuration.xml:720(emphasis) configuration.xml:729(emphasis) =

-msgid "&lt;propertyName&gt;"
+#. Tag: entry
+#: configuration.xml:727
+#, no-c-format
+msgid "Pass the property <emphasis>&lt;propertyName&gt;</emphasis> to the =
JNDI <literal>InitialContextFactory</literal>."
 msgstr ""
 =

-#: configuration.xml:720(literal) =

-msgid "hibernate.connection.<placeholder-1/>"
-msgstr ""
-
-#: configuration.xml:723(literal) configuration.xml:732(literal) =

-msgid "propertyName"
-msgstr ""
-
-#: configuration.xml:724(literal) =

-msgid "DriverManager.getConnection()"
-msgstr ""
-
-#: configuration.xml:722(entry) =

-msgid "Pass the JDBC property <placeholder-1/> to <placeholder-2/>."
-msgstr ""
-
-#: configuration.xml:729(literal) =

-msgid "hibernate.jndi.<placeholder-1/>"
-msgstr ""
-
-#: configuration.xml:731(entry) =

-msgid "Pass the property <placeholder-1/> to the JNDI <placeholder-2/>."
-msgstr ""
-
-#: configuration.xml:741(title) =

+#. Tag: title
+#: configuration.xml:737
+#, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr ""
 =

-#: configuration.xml:754(literal) =

+#. Tag: literal
+#: configuration.xml:750
+#, no-c-format
 msgid "hibernate.cache.provider_class"
 msgstr ""
 =

-#: configuration.xml:757(literal) =

-msgid "CacheProvider"
+#. Tag: entry
+#: configuration.xml:752
+#, no-c-format
+msgid "The classname of a custom <literal>CacheProvider</literal>."
 msgstr ""
 =

-#: configuration.xml:760(literal) =

-msgid "classname.of.CacheProvider"
+#. Tag: para
+#: configuration.xml:754
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Ca=
cheProvider</literal>"
 msgstr ""
 =

-#: configuration.xml:756(entry) =

-msgid "The classname of a custom <placeholder-1/>. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:766(literal) =

+#. Tag: literal
+#: configuration.xml:762
+#, no-c-format
 msgid "hibernate.cache.use_minimal_puts"
 msgstr ""
 =

-#: configuration.xml:768(entry) =

-msgid "Optimize second-level cache operation to minimize writes, at the co=
st of more frequent reads. This setting is most useful for clustered caches=
 and, in Hibernate3, is enabled by default for clustered cache implementati=
ons. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:764
+#, no-c-format
+msgid "Optimize second-level cache operation to minimize writes, at the co=
st of more frequent reads. This setting is most useful for clustered caches=
 and, in Hibernate3, is enabled by default for clustered cache implementati=
ons."
 msgstr ""
 =

-#: configuration.xml:781(literal) =

+#. Tag: literal
+#: configuration.xml:777
+#, no-c-format
 msgid "hibernate.cache.use_query_cache"
 msgstr ""
 =

-#: configuration.xml:783(entry) =

-msgid "Enable the query cache, individual queries still have to be set cac=
hable. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:779
+#, no-c-format
+msgid "Enable the query cache, individual queries still have to be set cac=
hable."
 msgstr ""
 =

-#: configuration.xml:793(literal) =

+#. Tag: literal
+#: configuration.xml:789
+#, no-c-format
 msgid "hibernate.cache.use_second_level_cache"
 msgstr ""
 =

-#: configuration.xml:797(literal) =

-msgid "&lt;cache&gt;"
+#. Tag: entry
+#: configuration.xml:791
+#, no-c-format
+msgid "May be used to completely disable the second level cache, which is =
enabled by default for classes which specify a <literal>&lt;cache&gt;</lite=
ral> mapping."
 msgstr ""
 =

-#: configuration.xml:795(entry) =

-msgid "May be used to completely disable the second level cache, which is =
enabled by default for classes which specify a <placeholder-1/> mapping. <p=
laceholder-2/>"
-msgstr ""
-
-#: configuration.xml:807(literal) =

+#. Tag: literal
+#: configuration.xml:803
+#, no-c-format
 msgid "hibernate.cache.query_cache_factory"
 msgstr ""
 =

-#: configuration.xml:810(literal) =

-msgid "QueryCache"
+#. Tag: entry
+#: configuration.xml:805
+#, no-c-format
+msgid "The classname of a custom <literal>QueryCache</literal> interface, =
defaults to the built-in <literal>StandardQueryCache</literal>."
 msgstr ""
 =

-#: configuration.xml:811(literal) =

-msgid "StandardQueryCache"
+#. Tag: para
+#: configuration.xml:808
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Qu=
eryCache</literal>"
 msgstr ""
 =

-#: configuration.xml:814(literal) =

-msgid "classname.of.QueryCache"
-msgstr ""
-
-#: configuration.xml:809(entry) =

-msgid "The classname of a custom <placeholder-1/> interface, defaults to t=
he built-in <placeholder-2/>. <placeholder-3/>"
-msgstr ""
-
-#: configuration.xml:820(literal) =

+#. Tag: literal
+#: configuration.xml:816
+#, no-c-format
 msgid "hibernate.cache.region_prefix"
 msgstr ""
 =

-#: configuration.xml:826(literal) =

-msgid "prefix"
+#. Tag: entry
+#: configuration.xml:818
+#, no-c-format
+msgid "A prefix to use for second-level cache region names."
 msgstr ""
 =

-#: configuration.xml:822(entry) =

-msgid "A prefix to use for second-level cache region names. <placeholder-1=
/>"
+#. Tag: para
+#: configuration.xml:820
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>prefix</literal=
>"
 msgstr ""
 =

-#: configuration.xml:832(literal) =

+#. Tag: literal
+#: configuration.xml:828
+#, no-c-format
 msgid "hibernate.cache.use_structured_entries"
 msgstr ""
 =

-#: configuration.xml:834(entry) =

-msgid "Forces Hibernate to store data in the second-level cache in a more =
human-friendly format. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:830
+#, no-c-format
+msgid "Forces Hibernate to store data in the second-level cache in a more =
human-friendly format."
 msgstr ""
 =

-#: configuration.xml:848(title) =

+#. Tag: title
+#: configuration.xml:844
+#, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr ""
 =

-#: configuration.xml:861(literal) =

+#. Tag: literal
+#: configuration.xml:857
+#, no-c-format
 msgid "hibernate.transaction.factory_class"
 msgstr ""
 =

-#: configuration.xml:864(literal) =

-msgid "TransactionFactory"
+#. Tag: entry
+#: configuration.xml:859
+#, no-c-format
+msgid "The classname of a <literal>TransactionFactory</literal> to use wit=
h Hibernate <literal>Transaction</literal> API (defaults to <literal>JDBCTr=
ansactionFactory</literal>)."
 msgstr ""
 =

-#: configuration.xml:865(literal) =

-msgid "Transaction"
+#. Tag: para
+#: configuration.xml:863
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Tr=
ansactionFactory</literal>"
 msgstr ""
 =

-#: configuration.xml:866(literal) =

-msgid "JDBCTransactionFactory"
-msgstr ""
-
-#: configuration.xml:869(literal) =

-msgid "classname.of.TransactionFactory"
-msgstr ""
-
-#: configuration.xml:863(entry) =

-msgid "The classname of a <placeholder-1/> to use with Hibernate <placehol=
der-2/> API (defaults to <placeholder-3/>). <placeholder-4/>"
-msgstr ""
-
-#: configuration.xml:875(literal) =

+#. Tag: literal
+#: configuration.xml:871
+#, no-c-format
 msgid "jta.UserTransaction"
 msgstr ""
 =

-#: configuration.xml:878(literal) =

-msgid "JTATransactionFactory"
+#. Tag: entry
+#: configuration.xml:873
+#, no-c-format
+msgid "A JNDI name used by <literal>JTATransactionFactory</literal> to obt=
ain the JTA <literal>UserTransaction</literal> from the application server."
 msgstr ""
 =

-#: configuration.xml:879(literal) =

-msgid "UserTransaction"
-msgstr ""
-
-#: configuration.xml:877(entry) =

-msgid "A JNDI name used by <placeholder-1/> to obtain the JTA <placeholder=
-2/> from the application server. <placeholder-3/>"
-msgstr ""
-
-#: configuration.xml:889(literal) =

+#. Tag: literal
+#: configuration.xml:885
+#, no-c-format
 msgid "hibernate.transaction.manager_lookup_class"
 msgstr ""
 =

-#: configuration.xml:892(literal) =

-msgid "TransactionManagerLookup"
+#. Tag: entry
+#: configuration.xml:887
+#, no-c-format
+msgid "The classname of a <literal>TransactionManagerLookup</literal> - re=
quired when JVM-level caching is enabled or when using hilo generator in a =
JTA environment."
 msgstr ""
 =

-#: configuration.xml:897(literal) =

-msgid "classname.of.TransactionManagerLookup"
+#. Tag: para
+#: configuration.xml:891
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>classname.of.Tr=
ansactionManagerLookup</literal>"
 msgstr ""
 =

-#: configuration.xml:891(entry) =

-msgid "The classname of a <placeholder-1/> - required when JVM-level cachi=
ng is enabled or when using hilo generator in a JTA environment. <placehold=
er-2/>"
-msgstr ""
-
-#: configuration.xml:903(literal) =

+#. Tag: literal
+#: configuration.xml:899
+#, no-c-format
 msgid "hibernate.transaction.flush_before_completion"
 msgstr ""
 =

-#: configuration.xml:905(entry) =

-msgid "If enabled, the session will be automatically flushed during the be=
fore completion phase of the transaction. Built-in and automatic session co=
ntext management is preferred, see <xref linkend=3D\"architecture-current-s=
ession\"/>. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:901
+#, no-c-format
+msgid "If enabled, the session will be automatically flushed during the be=
fore completion phase of the transaction. Built-in and automatic session co=
ntext management is preferred, see <xref linkend=3D\"architecture-current-s=
ession\"/>."
 msgstr ""
 =

-#: configuration.xml:918(literal) =

+#. Tag: literal
+#: configuration.xml:914
+#, no-c-format
 msgid "hibernate.transaction.auto_close_session"
 msgstr ""
 =

-#: configuration.xml:920(entry) =

-msgid "If enabled, the session will be automatically closed during the aft=
er completion phase of the transaction. Built-in and utomatic session conte=
xt management is preferred, see <xref linkend=3D\"architecture-current-sess=
ion\"/>. <placeholder-1/>"
+#. Tag: entry
+#: configuration.xml:916
+#, no-c-format
+msgid "If enabled, the session will be automatically closed during the aft=
er completion phase of the transaction. Built-in and utomatic session conte=
xt management is preferred, see <xref linkend=3D\"architecture-current-sess=
ion\"/>."
 msgstr ""
 =

-#: configuration.xml:936(title) =

+#. Tag: title
+#: configuration.xml:932
+#, no-c-format
 msgid "Miscellaneous Properties"
 msgstr ""
 =

-#: configuration.xml:949(literal) =

+#. Tag: literal
+#: configuration.xml:945
+#, no-c-format
 msgid "hibernate.current_session_context_class"
 msgstr ""
 =

-#: configuration.xml:953(literal) =

-msgid "Session"
+#. Tag: entry
+#: configuration.xml:947
+#, no-c-format
+msgid "Supply a (custom) strategy for the scoping of the \"current\" <lite=
ral>Session</literal>. See <xref linkend=3D\"architecture-current-session\"=
/> for more information about the built-in strategies."
 msgstr ""
 =

-#: configuration.xml:956(para) =

-msgid "<emphasis role=3D\"strong\">eg.</emphasis><literal>jta</literal> | =
<literal>thread</literal> | <literal>managed</literal> | <literal>custom.Cl=
ass</literal>"
+#. Tag: para
+#: configuration.xml:952
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>jta</literal> |=
 <literal>thread</literal> | <literal>managed</literal> | <literal>custom.C=
lass</literal>"
 msgstr ""
 =

-#: configuration.xml:951(entry) =

-msgid "Supply a (custom) strategy for the scoping of the \"current\" <plac=
eholder-1/>. See <xref linkend=3D\"architecture-current-session\"/> for mor=
e information about the built-in strategies. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:965(literal) =

+#. Tag: literal
+#: configuration.xml:961
+#, no-c-format
 msgid "hibernate.query.factory_class"
 msgstr ""
 =

-#: configuration.xml:969(para) =

-msgid "<emphasis role=3D\"strong\">eg.</emphasis><literal>org.hibernate.hq=
l.ast.ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.cla=
ssic.ClassicQueryTranslatorFactory</literal>"
+#. Tag: entry
+#: configuration.xml:963
+#, no-c-format
+msgid "Chooses the HQL parser implementation."
 msgstr ""
 =

-#: configuration.xml:967(entry) =

-msgid "Chooses the HQL parser implementation. <placeholder-1/>"
+#. Tag: para
+#: configuration.xml:965
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>org.hibernate.h=
ql.ast.ASTQueryTranslatorFactory</literal> or <literal>org.hibernate.hql.cl=
assic.ClassicQueryTranslatorFactory</literal>"
 msgstr ""
 =

-#: configuration.xml:978(literal) =

+#. Tag: literal
+#: configuration.xml:974
+#, no-c-format
 msgid "hibernate.query.substitutions"
 msgstr ""
 =

-#: configuration.xml:985(literal) =

-msgid "hqlLiteral=3DSQL_LITERAL, hqlFunction=3DSQLFUNC"
+#. Tag: entry
+#: configuration.xml:976
+#, no-c-format
+msgid "Mapping from tokens in Hibernate queries to SQL tokens (tokens migh=
t be function or literal names, for example)."
 msgstr ""
 =

-#: configuration.xml:980(entry) =

-msgid "Mapping from tokens in Hibernate queries to SQL tokens (tokens migh=
t be function or literal names, for example). <placeholder-1/>"
+#. Tag: para
+#: configuration.xml:979
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>hqlLiteral=3DSQ=
L_LITERAL, hqlFunction=3DSQLFUNC</literal>"
 msgstr ""
 =

-#: configuration.xml:991(literal) =

+#. Tag: literal
+#: configuration.xml:987
+#, no-c-format
 msgid "hibernate.hbm2ddl.auto"
 msgstr ""
 =

-#: configuration.xml:996(literal) =

-msgid "create-drop"
+#. Tag: entry
+#: configuration.xml:989
+#, no-c-format
+msgid "Automatically validate or export schema DDL to the database when th=
e <literal>SessionFactory</literal> is created. With <literal>create-drop</=
literal>, the database schema will be dropped when the <literal>SessionFact=
ory</literal> is closed explicitly."
 msgstr ""
 =

-#: configuration.xml:999(para) =

-msgid "<emphasis role=3D\"strong\">eg.</emphasis><literal>validate</litera=
l> | <literal>update</literal> | <literal>create</literal> | <literal>creat=
e-drop</literal>"
+#. Tag: para
+#: configuration.xml:995
+#, no-c-format
+msgid "<emphasis role=3D\"strong\">eg.</emphasis> <literal>validate</liter=
al> | <literal>update</literal> | <literal>create</literal> | <literal>crea=
te-drop</literal>"
 msgstr ""
 =

-#: configuration.xml:993(entry) =

-msgid "Automatically validate or export schema DDL to the database when th=
e <placeholder-1/> is created. With <placeholder-2/>, the database schema w=
ill be dropped when the <placeholder-3/> is closed explicitly. <placeholder=
-4/>"
-msgstr ""
-
-#: configuration.xml:1008(literal) =

+#. Tag: literal
+#: configuration.xml:1004
+#, no-c-format
 msgid "hibernate.cglib.use_reflection_optimizer"
 msgstr ""
 =

-#: configuration.xml:1014(literal) =

-msgid "hibernate.cfg.xml"
+#. Tag: entry
+#: configuration.xml:1006
+#, no-c-format
+msgid "Enables use of CGLIB instead of runtime reflection (System-level pr=
operty). Reflection can sometimes be useful when troubleshooting, note that=
 Hibernate always requires CGLIB even if you turn off the optimizer. You ca=
n not set this property in <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 =

-#: configuration.xml:1010(entry) =

-msgid "Enables use of CGLIB instead of runtime reflection (System-level pr=
operty). Reflection can sometimes be useful when troubleshooting, note that=
 Hibernate always requires CGLIB even if you turn off the optimizer. You ca=
n not set this property in <placeholder-1/>. <placeholder-2/>"
-msgstr ""
-
-#: configuration.xml:1026(title) =

+#. Tag: title
+#: configuration.xml:1022
+#, no-c-format
 msgid "SQL Dialects"
 msgstr ""
 =

-#: configuration.xml:1028(para) =

+#. Tag: para
+#: configuration.xml:1024
+#, no-c-format
 msgid "You should always set the <literal>hibernate.dialect</literal> prop=
erty to the correct <literal>org.hibernate.dialect.Dialect</literal> subcla=
ss for your database. If you specify a dialect, Hibernate will use sensible=
 defaults for some of the other properties listed above, saving you the eff=
ort of specifying them manually."
 msgstr ""
 =

-#: configuration.xml:1036(title) =

+#. Tag: title
+#: configuration.xml:1032
+#, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr ""
 =

-#: configuration.xml:1044(entry) =

+#. Tag: entry
+#: configuration.xml:1040
+#, no-c-format
 msgid "RDBMS"
 msgstr ""
 =

-#: configuration.xml:1050(entry) =

-msgid "DB2"
+#. Tag: entry
+#: configuration.xml:1041
+#, no-c-format
+msgid "Dialect"
 msgstr ""
 =

-#: configuration.xml:1050(literal) =

+#. Tag: entry
+#: configuration.xml:1046
+#, no-c-format
+msgid "<entry>DB2</entry>"
+msgstr ""
+
+#. Tag: literal
+#: configuration.xml:1046
+#, no-c-format
 msgid "org.hibernate.dialect.DB2Dialect"
 msgstr ""
 =

-#: configuration.xml:1053(entry) =

+#. Tag: entry
+#: configuration.xml:1049
+#, no-c-format
 msgid "DB2 AS/400"
 msgstr ""
 =

-#: configuration.xml:1053(literal) =

+#. Tag: literal
+#: configuration.xml:1049
+#, no-c-format
 msgid "org.hibernate.dialect.DB2400Dialect"
 msgstr ""
 =

-#: configuration.xml:1056(entry) =

+#. Tag: entry
+#: configuration.xml:1052
+#, no-c-format
 msgid "DB2 OS390"
 msgstr ""
 =

-#: configuration.xml:1056(literal) =

+#. Tag: literal
+#: configuration.xml:1052
+#, no-c-format
 msgid "org.hibernate.dialect.DB2390Dialect"
 msgstr ""
 =

-#: configuration.xml:1059(entry) =

+#. Tag: entry
+#: configuration.xml:1055
+#, no-c-format
 msgid "PostgreSQL"
 msgstr ""
 =

-#: configuration.xml:1059(literal) =

+#. Tag: literal
+#: configuration.xml:1055
+#, no-c-format
 msgid "org.hibernate.dialect.PostgreSQLDialect"
 msgstr ""
 =

-#: configuration.xml:1062(entry) =

+#. Tag: entry
+#: configuration.xml:1058
+#, no-c-format
 msgid "MySQL"
 msgstr ""
 =

-#: configuration.xml:1062(literal) =

+#. Tag: literal
+#: configuration.xml:1058
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLDialect"
 msgstr ""
 =

-#: configuration.xml:1065(entry) =

+#. Tag: entry
+#: configuration.xml:1061
+#, no-c-format
 msgid "MySQL with InnoDB"
 msgstr ""
 =

-#: configuration.xml:1065(literal) =

+#. Tag: literal
+#: configuration.xml:1061
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLInnoDBDialect"
 msgstr ""
 =

-#: configuration.xml:1068(entry) =

+#. Tag: entry
+#: configuration.xml:1064
+#, no-c-format
 msgid "MySQL with MyISAM"
 msgstr ""
 =

-#: configuration.xml:1068(literal) =

+#. Tag: literal
+#: configuration.xml:1064
+#, no-c-format
 msgid "org.hibernate.dialect.MySQLMyISAMDialect"
 msgstr ""
 =

-#: configuration.xml:1071(entry) =

+#. Tag: entry
+#: configuration.xml:1067
+#, no-c-format
 msgid "Oracle (any version)"
 msgstr ""
 =

-#: configuration.xml:1071(literal) =

+#. Tag: literal
+#: configuration.xml:1067
+#, no-c-format
 msgid "org.hibernate.dialect.OracleDialect"
 msgstr ""
 =

-#: configuration.xml:1074(entry) =

+#. Tag: entry
+#: configuration.xml:1070
+#, no-c-format
 msgid "Oracle 9i/10g"
 msgstr ""
 =

-#: configuration.xml:1074(literal) =

+#. Tag: literal
+#: configuration.xml:1070
+#, no-c-format
 msgid "org.hibernate.dialect.Oracle9Dialect"
 msgstr ""
 =

-#: configuration.xml:1077(entry) =

+#. Tag: entry
+#: configuration.xml:1073
+#, no-c-format
 msgid "Sybase"
 msgstr ""
 =

-#: configuration.xml:1077(literal) =

+#. Tag: literal
+#: configuration.xml:1073
+#, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr ""
 =

-#: configuration.xml:1080(entry) =

+#. Tag: entry
+#: configuration.xml:1076
+#, no-c-format
 msgid "Sybase Anywhere"
 msgstr ""
 =

-#: configuration.xml:1080(literal) =

+#. Tag: literal
+#: configuration.xml:1076
+#, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr ""
 =

-#: configuration.xml:1083(entry) =

+#. Tag: entry
+#: configuration.xml:1079
+#, no-c-format
 msgid "Microsoft SQL Server"
 msgstr ""
 =

-#: configuration.xml:1083(literal) =

+#. Tag: literal
+#: configuration.xml:1079
+#, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr ""
 =

-#: configuration.xml:1086(entry) =

+#. Tag: entry
+#: configuration.xml:1082
+#, no-c-format
 msgid "SAP DB"
 msgstr ""
 =

-#: configuration.xml:1086(literal) =

+#. Tag: literal
+#: configuration.xml:1082
+#, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr ""
 =

-#: configuration.xml:1089(entry) =

+#. Tag: entry
+#: configuration.xml:1085
+#, no-c-format
 msgid "Informix"
 msgstr ""
 =

-#: configuration.xml:1089(literal) =

+#. Tag: literal
+#: configuration.xml:1085
+#, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr ""
 =

-#: configuration.xml:1092(entry) =

+#. Tag: entry
+#: configuration.xml:1088
+#, no-c-format
 msgid "HypersonicSQL"
 msgstr ""
 =

-#: configuration.xml:1092(literal) =

+#. Tag: literal
+#: configuration.xml:1088
+#, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr ""
 =

-#: configuration.xml:1095(entry) =

+#. Tag: entry
+#: configuration.xml:1091
+#, no-c-format
 msgid "Ingres"
 msgstr ""
 =

-#: configuration.xml:1095(literal) =

+#. Tag: literal
+#: configuration.xml:1091
+#, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr ""
 =

-#: configuration.xml:1098(entry) =

+#. Tag: entry
+#: configuration.xml:1094
+#, no-c-format
 msgid "Progress"
 msgstr ""
 =

-#: configuration.xml:1098(literal) =

+#. Tag: literal
+#: configuration.xml:1094
+#, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr ""
 =

-#: configuration.xml:1101(entry) =

+#. Tag: entry
+#: configuration.xml:1097
+#, no-c-format
 msgid "Mckoi SQL"
 msgstr ""
 =

-#: configuration.xml:1101(literal) =

+#. Tag: literal
+#: configuration.xml:1097
+#, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr ""
 =

-#: configuration.xml:1104(entry) =

+#. Tag: entry
+#: configuration.xml:1100
+#, no-c-format
 msgid "Interbase"
 msgstr ""
 =

-#: configuration.xml:1104(literal) =

+#. Tag: literal
+#: configuration.xml:1100
+#, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr ""
 =

-#: configuration.xml:1107(entry) =

+#. Tag: entry
+#: configuration.xml:1103
+#, no-c-format
 msgid "Pointbase"
 msgstr ""
 =

-#: configuration.xml:1107(literal) =

+#. Tag: literal
+#: configuration.xml:1103
+#, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr ""
 =

-#: configuration.xml:1110(entry) =

+#. Tag: entry
+#: configuration.xml:1106
+#, no-c-format
 msgid "FrontBase"
 msgstr ""
 =

-#: configuration.xml:1110(literal) =

+#. Tag: literal
+#: configuration.xml:1106
+#, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr ""
 =

-#: configuration.xml:1113(entry) =

+#. Tag: entry
+#: configuration.xml:1109
+#, no-c-format
 msgid "Firebird"
 msgstr ""
 =

-#: configuration.xml:1113(literal) =

+#. Tag: literal
+#: configuration.xml:1109
+#, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr ""
 =

-#: configuration.xml:1122(title) =

+#. Tag: title
+#: configuration.xml:1118
+#, no-c-format
 msgid "Outer Join Fetching"
 msgstr ""
 =

-#: configuration.xml:1124(para) =

+#. Tag: para
+#: configuration.xml:1120
+#, no-c-format
 msgid "If your database supports ANSI, Oracle or Sybase style outer joins,=
 <emphasis>outer join fetching</emphasis> will often increase performance b=
y limiting the number of round trips to and from the database (at the cost =
of possibly more work performed by the database itself). Outer join fetchin=
g allows a whole graph of objects connected by many-to-one, one-to-many, ma=
ny-to-many and one-to-one associations to be retrieved in a single SQL <lit=
eral>SELECT</literal>."
 msgstr ""
 =

-#: configuration.xml:1133(para) =

+#. Tag: para
+#: configuration.xml:1129
+#, no-c-format
 msgid "Outer join fetching may be disabled <emphasis>globally</emphasis> b=
y setting the property <literal>hibernate.max_fetch_depth</literal> to <lit=
eral>0</literal>. A setting of <literal>1</literal> or higher enables outer=
 join fetching for one-to-one and many-to-one associations which have been =
mapped with <literal>fetch=3D\"join\"</literal>."
 msgstr ""
 =

-#: configuration.xml:1141(para) =

+#. Tag: para
+#: configuration.xml:1137
+#, no-c-format
 msgid "See <xref linkend=3D\"performance-fetching\"/> for more information=
."
 msgstr ""
 =

-#: configuration.xml:1148(title) =

+#. Tag: title
+#: configuration.xml:1144
+#, no-c-format
 msgid "Binary Streams"
 msgstr ""
 =

-#: configuration.xml:1150(para) =

+#. Tag: para
+#: configuration.xml:1146
+#, no-c-format
 msgid "Oracle limits the size of <literal>byte</literal> arrays that may b=
e passed to/from its JDBC driver. If you wish to use large instances of <li=
teral>binary</literal> or <literal>serializable</literal> type, you should =
enable <literal>hibernate.jdbc.use_streams_for_binary</literal>. <emphasis>=
This is a system-level setting only.</emphasis>"
 msgstr ""
 =

-#: configuration.xml:1161(title) =

+#. Tag: title
+#: configuration.xml:1157
+#, no-c-format
 msgid "Second-level and query cache"
 msgstr ""
 =

-#: configuration.xml:1163(para) =

+#. Tag: para
+#: configuration.xml:1159
+#, no-c-format
 msgid "The properties prefixed by <literal>hibernate.cache</literal> allow=
 you to use a process or cluster scoped second-level cache system with Hibe=
rnate. See the <xref linkend=3D\"performance-cache\"/> for more details."
 msgstr ""
 =

-#: configuration.xml:1173(title) =

+#. Tag: title
+#: configuration.xml:1169
+#, no-c-format
 msgid "Query Language Substitution"
 msgstr ""
 =

-#: configuration.xml:1175(para) =

+#. Tag: para
+#: configuration.xml:1171
+#, no-c-format
 msgid "You may define new Hibernate query tokens using <literal>hibernate.=
query.substitutions</literal>. For example:"
 msgstr ""
 =

-#: configuration.xml:1180(programlisting) =

-#, no-wrap
+#. Tag: programlisting
+#: configuration.xml:1176
+#, no-c-format
 msgid "hibernate.query.substitutions true=3D1, false=3D0"
 msgstr ""
 =

-#: configuration.xml:1182(para) =

+#. Tag: para
+#: configuration.xml:1178
+#, no-c-format
 msgid "would cause the tokens <literal>true</literal> and <literal>false</=
literal> to be translated to integer literals in the generated SQL."
 msgstr ""
 =

-#: configuration.xml:1187(programlisting) =

-#, no-wrap
+#. Tag: programlisting
+#: configuration.xml:1183
+#, no-c-format
 msgid "hibernate.query.substitutions toLowercase=3DLOWER"
 msgstr ""
 =

-#: configuration.xml:1189(para) =

+#. Tag: para
+#: configuration.xml:1185
+#, no-c-format
 msgid "would allow you to rename the SQL <literal>LOWER</literal> function=
."
 msgstr ""
 =

-#: configuration.xml:1196(title) =

+#. Tag: title
+#: configuration.xml:1192
+#, no-c-format
 msgid "Hibernate statistics"
 msgstr ""
 =

-#: configuration.xml:1198(para) =

+#. Tag: para
+#: configuration.xml:1194
+#, no-c-format
 msgid "If you enable <literal>hibernate.generate_statistics</literal>, Hib=
ernate will expose a number of metrics that are useful when tuning a runnin=
g system via <literal>SessionFactory.getStatistics()</literal>. Hibernate c=
an even be configured to expose these statistics via JMX. Read the Javadoc =
of the interfaces in <literal>org.hibernate.stats</literal> for more inform=
ation."
 msgstr ""
 =

-#: configuration.xml:1210(title) =

+#. Tag: title
+#: configuration.xml:1206
+#, no-c-format
 msgid "Logging"
 msgstr ""
 =

-#: configuration.xml:1212(para) =

+#. Tag: para
+#: configuration.xml:1208
+#, no-c-format
 msgid "Hibernate logs various events using Apache commons-logging."
 msgstr ""
 =

-#: configuration.xml:1216(para) =

+#. Tag: para
+#: configuration.xml:1212
+#, no-c-format
 msgid "The commons-logging service will direct output to either Apache Log=
4j (if you include <literal>log4j.jar</literal> in your classpath) or JDK1.=
4 logging (if running under JDK1.4 or above). You may download Log4j from <=
literal>http://jakarta.apache.org</literal>. To use Log4j you will need to =
place a <literal>log4j.properties</literal> file in your classpath, an exam=
ple properties file is distributed with Hibernate in the <literal>src/</lit=
eral> directory."
 msgstr ""
 =

-#: configuration.xml:1226(para) =

+#. Tag: para
+#: configuration.xml:1222
+#, no-c-format
 msgid "We strongly recommend that you familiarize yourself with Hibernate'=
s log messages. A lot of work has been put into making the Hibernate log as=
 detailed as possible, without making it unreadable. It is an essential tro=
ubleshooting device. The most interesting log categories are the following:"
 msgstr ""
 =

-#: configuration.xml:1235(title) =

+#. Tag: title
+#: configuration.xml:1231
+#, no-c-format
 msgid "Hibernate Log Categories"
 msgstr ""
 =

-#: configuration.xml:1241(entry) =

+#. Tag: entry
+#: configuration.xml:1237
+#, no-c-format
 msgid "Category"
 msgstr ""
 =

-#: configuration.xml:1242(entry) =

+#. Tag: entry
+#: configuration.xml:1238
+#, no-c-format
 msgid "Function"
 msgstr ""
 =

-#: configuration.xml:1248(entry) =

+#. Tag: literal
+#: configuration.xml:1243
+#, no-c-format
+msgid "org.hibernate.SQL"
+msgstr ""
+
+#. Tag: entry
+#: configuration.xml:1244
+#, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr ""
 =

-#: configuration.xml:1251(literal) =

+#. Tag: literal
+#: configuration.xml:1247
+#, no-c-format
 msgid "org.hibernate.type"
 msgstr ""
 =

-#: configuration.xml:1252(entry) =

+#. Tag: entry
+#: configuration.xml:1248
+#, no-c-format
 msgid "Log all JDBC parameters"
 msgstr ""
 =

-#: configuration.xml:1255(literal) =

+#. Tag: literal
+#: configuration.xml:1251
+#, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr ""
 =

-#: configuration.xml:1256(entry) =

+#. Tag: entry
+#: configuration.xml:1252
+#, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr ""
 =

-#: configuration.xml:1259(literal) =

+#. Tag: literal
+#: configuration.xml:1255
+#, no-c-format
 msgid "org.hibernate.pretty"
 msgstr ""
 =

-#: configuration.xml:1260(entry) =

+#. Tag: entry
+#: configuration.xml:1256
+#, no-c-format
 msgid "Log the state of all entities (max 20 entities) associated with the=
 session at flush time"
 msgstr ""
 =

-#: configuration.xml:1266(literal) =

+#. Tag: literal
+#: configuration.xml:1262
+#, no-c-format
 msgid "org.hibernate.cache"
 msgstr ""
 =

-#: configuration.xml:1267(entry) =

+#. Tag: entry
+#: configuration.xml:1263
+#, no-c-format
 msgid "Log all second-level cache activity"
 msgstr ""
 =

-#: configuration.xml:1270(literal) =

+#. Tag: literal
+#: configuration.xml:1266
+#, no-c-format
 msgid "org.hibernate.transaction"
 msgstr ""
 =

-#: configuration.xml:1271(entry) =

+#. Tag: entry
+#: configuration.xml:1267
+#, no-c-format
 msgid "Log transaction related activity"
 msgstr ""
 =

-#: configuration.xml:1274(literal) =

+#. Tag: literal
+#: configuration.xml:1270
+#, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr ""
 =

-#: configuration.xml:1275(entry) =

+#. Tag: entry
+#: configuration.xml:1271
+#, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr ""
 =

-#: configuration.xml:1278(literal) =

+#. Tag: literal
+#: configuration.xml:1274
+#, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr ""
 =

-#: configuration.xml:1279(entry) =

+#. Tag: entry
+#: configuration.xml:1275
+#, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
 =

-#: configuration.xml:1284(literal) =

+#. Tag: literal
+#: configuration.xml:1280
+#, no-c-format
 msgid "org.hibernate.secure"
 msgstr ""
 =

-#: configuration.xml:1285(entry) =

+#. Tag: entry
+#: configuration.xml:1281
+#, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr ""
 =

-#: configuration.xml:1288(literal) =

+#. Tag: literal
+#: configuration.xml:1284
+#, no-c-format
 msgid "org.hibernate"
 msgstr ""
 =

-#: configuration.xml:1289(entry) =

+#. Tag: entry
+#: configuration.xml:1285
+#, no-c-format
 msgid "Log everything (a lot of information, but very useful for troublesh=
ooting)"
 msgstr ""
 =

-#: configuration.xml:1298(para) =

+#. Tag: para
+#: configuration.xml:1294
+#, no-c-format
 msgid "When developing applications with Hibernate, you should almost alwa=
ys work with <literal>debug</literal> enabled for the category <literal>org=
.hibernate.SQL</literal>, or, alternatively, the property <literal>hibernat=
e.show_sql</literal> enabled."
 msgstr ""
 =

-#: configuration.xml:1308(title) =

+#. Tag: title
+#: configuration.xml:1304
+#, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr ""
 =

-#: configuration.xml:1310(para) =

+#. Tag: para
+#: configuration.xml:1306
+#, no-c-format
 msgid "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> a=
llows you to specify a \"naming standard\" for database objects and schema =
elements."
 msgstr ""
 =

-#: configuration.xml:1315(para) =

+#. Tag: para
+#: configuration.xml:1311
+#, no-c-format
 msgid "You may provide rules for automatically generating database identif=
iers from Java identifiers or for processing \"logical\" column and table n=
ames given in the mapping file into \"physical\" table and column names. Th=
is feature helps reduce the verbosity of the mapping document, eliminating =
repetitive noise (<literal>TBL_</literal> prefixes, for example). The defau=
lt strategy used by Hibernate is quite minimal."
 msgstr ""
 =

-#: configuration.xml:1324(para) =

+#. Tag: para
+#: configuration.xml:1320
+#, no-c-format
 msgid "You may specify a different strategy by calling <literal>Configurat=
ion.setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 =

-#: configuration.xml:1335(para) =

+#. Tag: programlisting
+#: configuration.xml:1325
+#, no-c-format
+msgid ""
+      "<![CDATA[SessionFactory sf =3D new Configuration()\n"
+      "    .setNamingStrategy(ImprovedNamingStrategy.INSTANCE)\n"
+      "    .addFile(\"Item.hbm.xml\")\n"
+      "    .addFile(\"Bid.hbm.xml\")\n"
+      "    .buildSessionFactory();]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:1327
+#, no-c-format
 msgid "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a bu=
ilt-in strategy that might be a useful starting point for some applications=
."
 msgstr ""
 =

-#: configuration.xml:1343(title) =

+#. Tag: title
+#: configuration.xml:1335
+#, no-c-format
 msgid "XML configuration file"
 msgstr ""
 =

-#: configuration.xml:1345(para) =

+#. Tag: para
+#: configuration.xml:1337
+#, no-c-format
 msgid "An alternative approach to configuration is to specify a full confi=
guration in a file named <literal>hibernate.cfg.xml</literal>. This file ca=
n be used as a replacement for the <literal>hibernate.properties</literal> =
file or, if both are present, to override properties."
 msgstr ""
 =

-#: configuration.xml:1352(para) =

+#. Tag: para
+#: configuration.xml:1344
+#, no-c-format
 msgid "The XML configuration file is by default expected to be in the root=
 o your <literal>CLASSPATH</literal>. Here is an example:"
 msgstr ""
 =

-#: configuration.xml:1390(para) =

+#. Tag: programlisting
+#: configuration.xml:1349
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D'1.0' encoding=3D'utf-8'?>\n"
+      "<!DOCTYPE hibernate-configuration PUBLIC\n"
+      "    \"-//Hibernate/Hibernate Configuration DTD//EN\"\n"
+      "    \"http://hibernate.sourceforge.net/hibernate-configuration-3.0.=
dtd\">\n"
+      "\n"
+      "<hibernate-configuration>\n"
+      "\n"
+      "    <!-- a SessionFactory instance listed as /jndi/name -->\n"
+      "    <session-factory\n"
+      "        name=3D\"java:hibernate/SessionFactory\">\n"
+      "\n"
+      "        <!-- properties -->\n"
+      "        <property name=3D\"connection.datasource\">java:/comp/env/j=
dbc/MyDB</property>\n"
+      "        <property name=3D\"dialect\">org.hibernate.dialect.MySQLDia=
lect</property>\n"
+      "        <property name=3D\"show_sql\">false</property>\n"
+      "        <property name=3D\"transaction.factory_class\">\n"
+      "            org.hibernate.transaction.JTATransactionFactory\n"
+      "        </property>\n"
+      "        <property name=3D\"jta.UserTransaction\">java:comp/UserTran=
saction</property>\n"
+      "\n"
+      "        <!-- mapping files -->\n"
+      "        <mapping resource=3D\"org/hibernate/auction/Item.hbm.xml\"/=
>\n"
+      "        <mapping resource=3D\"org/hibernate/auction/Bid.hbm.xml\"/>=
\n"
+      "\n"
+      "        <!-- cache settings -->\n"
+      "        <class-cache class=3D\"org.hibernate.auction.Item\" usage=
=3D\"read-write\"/>\n"
+      "        <class-cache class=3D\"org.hibernate.auction.Bid\" usage=3D=
\"read-only\"/>\n"
+      "        <collection-cache collection=3D\"org.hibernate.auction.Item=
.bids\" usage=3D\"read-write\"/>\n"
+      "\n"
+      "    </session-factory>\n"
+      "\n"
+      "</hibernate-configuration>]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:1351
+#, no-c-format
 msgid "As you can see, the advantage of this approach is the externalizati=
on of the mapping file names to configuration. The <literal>hibernate.cfg.x=
ml</literal> is also more convenient once you have to tune the Hibernate ca=
che. Note that is your choice to use either <literal>hibernate.properties</=
literal> or <literal>hibernate.cfg.xml</literal>, both are equivalent, exce=
pt for the above mentioned benefits of using the XML syntax."
 msgstr ""
 =

-#: configuration.xml:1399(para) =

+#. Tag: para
+#: configuration.xml:1360
+#, no-c-format
 msgid "With the XML configuration, starting Hibernate is then as simple as"
 msgstr ""
 =

-#: configuration.xml:1405(para) =

+#. Tag: programlisting
+#: configuration.xml:1364
+#, no-c-format
+msgid "<![CDATA[SessionFactory sf =3D new Configuration().configure().buil=
dSessionFactory();]]>"
+msgstr ""
+
+#. Tag: para
+#: configuration.xml:1366
+#, no-c-format
 msgid "You can pick a different XML configuration file using"
 msgstr ""
 =

-#: configuration.xml:1416(title) =

+#. Tag: programlisting
+#: configuration.xml:1370
+#, no-c-format
+msgid ""
+      "<![CDATA[SessionFactory sf =3D new Configuration()\n"
+      "    .configure(\"catdb.cfg.xml\")\n"
+      "    .buildSessionFactory();]]>"
+msgstr ""
+
+#. Tag: title
+#: configuration.xml:1375
+#, no-c-format
 msgid "J2EE Application Server integration"
 msgstr ""
 =

-#: configuration.xml:1418(para) =

+#. Tag: para
+#: configuration.xml:1377
+#, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastruct=
ure:"
 msgstr ""
 =

-#: configuration.xml:1424(para) =

+#. Tag: para
+#: configuration.xml:1383
+#, no-c-format
 msgid "<emphasis>Container-managed datasources</emphasis>: Hibernate can u=
se JDBC connections managed by the container and provided through JNDI. Usu=
ally, a JTA compatible <literal>TransactionManager</literal> and a <literal=
>ResourceManager</literal> take care of transaction management (CMT), esp. =
distributed transaction handling across several datasources. You may of cou=
rse also demarcate transaction boundaries programmatically (BMT) or you mig=
ht want to use the optional Hibernate <literal>Transaction</literal> API fo=
r this to keep your code portable."
 msgstr ""
 =

-#: configuration.xml:1439(para) =

+#. Tag: para
+#: configuration.xml:1398
+#, no-c-format
 msgid "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its=
 <literal>SessionFactory</literal> to JNDI after startup."
 msgstr ""
 =

-#: configuration.xml:1448(para) =

+#. Tag: para
+#: configuration.xml:1407
+#, no-c-format
 msgid "<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Se=
ssion</literal> may be automatically bound to the scope of JTA transactions=
. Simply lookup the <literal>SessionFactory</literal> from JNDI and get the=
 current <literal>Session</literal>. Let Hibernate take care of flushing an=
d closing the <literal>Session</literal> when your JTA transaction complete=
s. Transaction demarcation is either declarative (CMT) or programmatic (BMT=
/UserTransaction)."
 msgstr ""
 =

-#: configuration.xml:1461(para) =

+#. Tag: para
+#: configuration.xml:1420
+#, no-c-format
 msgid "<emphasis>JMX deployment:</emphasis> If you have a JMX capable appl=
ication server (e.g. JBoss AS), you can chose to deploy Hibernate as a mana=
ged MBean. This saves you the one line startup code to build your <literal>=
SessionFactory</literal> from a <literal>Configuration</literal>. The conta=
iner will startup your <literal>HibernateService</literal>, and ideally als=
o take care of service dependencies (Datasource has to be available before =
Hibernate starts, etc)."
 msgstr ""
 =

-#: configuration.xml:1472(para) =

+#. Tag: para
+#: configuration.xml:1431
+#, no-c-format
 msgid "Depending on your environment, you might have to set the configurat=
ion option <literal>hibernate.connection.aggressive_release</literal> to tr=
ue if your application server shows \"connection containment\" exceptions."
 msgstr ""
 =

-#: configuration.xml:1479(title) =

+#. Tag: title
+#: configuration.xml:1438
+#, no-c-format
 msgid "Transaction strategy configuration"
 msgstr ""
 =

-#: configuration.xml:1481(para) =

+#. Tag: para
+#: configuration.xml:1440
+#, no-c-format
 msgid "The Hibernate <literal>Session</literal> API is independent of any =
transaction demarcation system in your architecture. If you let Hibernate u=
se JDBC directly, through a connection pool, you may begin and end your tra=
nsactions by calling the JDBC API. If you run in a J2EE application server,=
 you might want to use bean-managed transactions and call the JTA API and <=
literal>UserTransaction</literal> when needed."
 msgstr ""
 =

-#: configuration.xml:1489(para) =

+#. Tag: para
+#: configuration.xml:1448
+#, no-c-format
 msgid "To keep your code portable between these two (and other) environmen=
ts we recommend the optional Hibernate <literal>Transaction</literal> API, =
which wraps and hides the underlying system. You have to specify a factory =
class for <literal>Transaction</literal> instances by setting the Hibernate=
 configuration property <literal>hibernate.transaction.factory_class</liter=
al>."
 msgstr ""
 =

-#: configuration.xml:1496(para) =

+#. Tag: para
+#: configuration.xml:1455
+#, no-c-format
 msgid "There are three standard (built-in) choices:"
 msgstr ""
 =

-#: configuration.xml:1502(literal) =

+#. Tag: literal
+#: configuration.xml:1461
+#, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr ""
 =

-#: configuration.xml:1504(para) =

+#. Tag: para
+#: configuration.xml:1463
+#, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr ""
 =

-#: configuration.xml:1508(literal) =

+#. Tag: literal
+#: configuration.xml:1467
+#, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr ""
 =

-#: configuration.xml:1510(para) =

+#. Tag: para
+#: configuration.xml:1469
+#, no-c-format
 msgid "delegates to container-managed transaction if an existing transacti=
on is underway in this context (e.g. EJB session bean method), otherwise a =
new transaction is started and bean-managed transaction are used."
 msgstr ""
 =

-#: configuration.xml:1518(literal) =

+#. Tag: literal
+#: configuration.xml:1477
+#, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr ""
 =

-#: configuration.xml:1520(para) =

+#. Tag: para
+#: configuration.xml:1479
+#, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr ""
 =

-#: configuration.xml:1525(para) =

+#. Tag: para
+#: configuration.xml:1484
+#, no-c-format
 msgid "You may also define your own transaction strategies (for a CORBA tr=
ansaction service, for example)."
 msgstr ""
 =

-#: configuration.xml:1530(para) =

+#. Tag: para
+#: configuration.xml:1489
+#, no-c-format
 msgid "Some features in Hibernate (i.e. the second level cache, Contextual=
 Sessions with JTA, etc.) require access to the JTA <literal>TransactionMan=
ager</literal> in a managed environment. In an application server you have =
to specify how Hibernate should obtain a reference to the <literal>Transact=
ionManager</literal>, since J2EE does not standardize a single mechanism:"
 msgstr ""
 =

-#: configuration.xml:1538(title) =

+#. Tag: title
+#: configuration.xml:1497
+#, no-c-format
 msgid "JTA TransactionManagers"
 msgstr ""
 =

-#: configuration.xml:1544(entry) =

+#. Tag: entry
+#: configuration.xml:1503
+#, no-c-format
 msgid "Transaction Factory"
 msgstr ""
 =

-#: configuration.xml:1545(entry) =

+#. Tag: entry
+#: configuration.xml:1504
+#, no-c-format
 msgid "Application Server"
 msgstr ""
 =

-#: configuration.xml:1550(literal) =

+#. Tag: literal
+#: configuration.xml:1509
+#, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1551(entry) =

+#. Tag: entry
+#: configuration.xml:1510
+#, no-c-format
 msgid "JBoss"
 msgstr ""
 =

-#: configuration.xml:1554(literal) =

+#. Tag: literal
+#: configuration.xml:1513
+#, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1555(entry) =

+#. Tag: entry
+#: configuration.xml:1514
+#, no-c-format
 msgid "Weblogic"
 msgstr ""
 =

-#: configuration.xml:1558(literal) =

+#. Tag: literal
+#: configuration.xml:1517
+#, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1559(entry) =

+#. Tag: entry
+#: configuration.xml:1518
+#, no-c-format
 msgid "WebSphere"
 msgstr ""
 =

-#: configuration.xml:1562(literal) =

+#. Tag: literal
+#: configuration.xml:1521
+#, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr ""
 =

-#: configuration.xml:1563(entry) =

+#. Tag: entry
+#: configuration.xml:1522
+#, no-c-format
 msgid "WebSphere 6"
 msgstr ""
 =

-#: configuration.xml:1566(literal) =

+#. Tag: literal
+#: configuration.xml:1525
+#, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1567(entry) =

+#. Tag: entry
+#: configuration.xml:1526
+#, no-c-format
 msgid "Orion"
 msgstr ""
 =

-#: configuration.xml:1570(literal) =

+#. Tag: literal
+#: configuration.xml:1529
+#, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1571(entry) =

+#. Tag: entry
+#: configuration.xml:1530
+#, no-c-format
 msgid "Resin"
 msgstr ""
 =

-#: configuration.xml:1574(literal) =

+#. Tag: literal
+#: configuration.xml:1533
+#, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1575(entry) =

+#. Tag: entry
+#: configuration.xml:1534
+#, no-c-format
 msgid "JOTM"
 msgstr ""
 =

-#: configuration.xml:1578(literal) =

+#. Tag: literal
+#: configuration.xml:1537
+#, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1579(entry) =

+#. Tag: entry
+#: configuration.xml:1538
+#, no-c-format
 msgid "JOnAS"
 msgstr ""
 =

-#: configuration.xml:1582(literal) =

+#. Tag: literal
+#: configuration.xml:1541
+#, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1583(entry) =

+#. Tag: entry
+#: configuration.xml:1542
+#, no-c-format
 msgid "JRun4"
 msgstr ""
 =

-#: configuration.xml:1586(literal) =

+#. Tag: literal
+#: configuration.xml:1545
+#, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr ""
 =

-#: configuration.xml:1587(entry) =

+#. Tag: entry
+#: configuration.xml:1546
+#, no-c-format
 msgid "Borland ES"
 msgstr ""
 =

-#: configuration.xml:1596(title) =

+#. Tag: title
+#: configuration.xml:1555
+#, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr ""
 =

-#: configuration.xml:1598(para) =

+#. Tag: para
+#: configuration.xml:1557
+#, no-c-format
 msgid "A JNDI bound Hibernate <literal>SessionFactory</literal> can simpli=
fy the lookup of the factory and the creation of new <literal>Session</lite=
ral>s. Note that this is not related to a JNDI bound <literal>Datasource</l=
iteral>, both simply use the same registry!"
 msgstr ""
 =

-#: configuration.xml:1605(para) =

+#. Tag: para
+#: configuration.xml:1564
+#, no-c-format
 msgid "If you wish to have the <literal>SessionFactory</literal> bound to =
a JNDI namespace, specify a name (eg. <literal>java:hibernate/SessionFactor=
y</literal>) using the property <literal>hibernate.session_factory_name</li=
teral>. If this property is omitted, the <literal>SessionFactory</literal> =
will not be bound to JNDI. (This is especially useful in environments with =
a read-only JNDI default implementation, e.g. Tomcat.)"
 msgstr ""
 =

-#: configuration.xml:1613(para) =

+#. Tag: para
+#: configuration.xml:1572
+#, no-c-format
 msgid "When binding the <literal>SessionFactory</literal> to JNDI, Hiberna=
te will use the values of <literal>hibernate.jndi.url</literal>, <literal>h=
ibernate.jndi.class</literal> to instantiate an initial context. If they ar=
e not specified, the default <literal>InitialContext</literal> will be used=
."
 msgstr ""
 =

-#: configuration.xml:1620(para) =

+#. Tag: para
+#: configuration.xml:1579
+#, no-c-format
 msgid "Hibernate will automatically place the <literal>SessionFactory</lit=
eral> in JNDI after you call <literal>cfg.buildSessionFactory()</literal>. =
This means you will at least have this call in some startup code (or utilit=
y class) in your application, unless you use JMX deployment with the <liter=
al>HibernateService</literal> (discussed later)."
 msgstr ""
 =

-#: configuration.xml:1627(para) =

+#. Tag: para
+#: configuration.xml:1586
+#, no-c-format
 msgid "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any =
other class may obtain the <literal>SessionFactory</literal> using a JNDI l=
ookup."
 msgstr ""
 =

-#: configuration.xml:1632(para) =

+#. Tag: para
+#: configuration.xml:1591
+#, no-c-format
 msgid "We recommend that you bind the <literal>SessionFactory</literal> to=
 JNDI in a managed environment and use a <literal>static</literal> singleto=
n otherwise. To shield your application code from these details, we also re=
commend to hide the actual lookup code for a <literal>SessionFactory</liter=
al> in a helper class, such as <literal>HibernateUtil.getSessionFactory()</=
literal>. Note that such a class is also a convenient way to startup Hibern=
ate&mdash;see chapter 1."
 msgstr ""
 =

-#: configuration.xml:1644(title) =

+#. Tag: title
+#: configuration.xml:1603
+#, no-c-format
 msgid "Current Session context management with JTA"
 msgstr ""
 =

-#: configuration.xml:1646(para) =

-msgid "The easiest way to handle <literal>Session</literal>s and transacti=
ons is Hibernates automatic \"current\" <literal>Session</literal> manageme=
nt. See the discussion of <xref linkend=3D\"architecture-current-session\">=
current sessions</xref>. Using the <literal>\"jta\"</literal> session conte=
xt, if there is no Hibernate <literal>Session</literal> associated with the=
 current JTA transaction, one will be started and associated with that JTA =
transaction the first time you call <literal>sessionFactory.getCurrentSessi=
on()</literal>. The <literal>Session</literal>s retrieved via <literal>getC=
urrentSession()</literal> in <literal>\"jta\"</literal> context will be set=
 to automatically flush before the transaction completes, close after the t=
ransaction completes, and aggressively release JDBC connections after each =
statement. This allows the <literal>Session</literal>s to be managed by the=
 life cycle of the JTA transaction to which it is associated, keeping user =
code clean of su!
 ch management concerns. Your code can either use JTA programmatically thro=
ugh <literal>UserTransaction</literal>, or (recommended for portable code) =
use the Hibernate <literal>Transaction</literal> API to set transaction bou=
ndaries. If you run in an EJB container, declarative transaction demarcatio=
n with CMT is preferred."
+#. Tag: para
+#: configuration.xml:1605
+#, no-c-format
+msgid "The easiest way to handle <literal>Session</literal>s and transacti=
ons is Hibernates automatic \"current\" <literal>Session</literal> manageme=
nt. See the discussion of <link linkend=3D\"architecture-current-session\">=
current sessions</link>. Using the <literal>\"jta\"</literal> session conte=
xt, if there is no Hibernate <literal>Session</literal> associated with the=
 current JTA transaction, one will be started and associated with that JTA =
transaction the first time you call <literal>sessionFactory.getCurrentSessi=
on()</literal>. The <literal>Session</literal>s retrieved via <literal>getC=
urrentSession()</literal> in <literal>\"jta\"</literal> context will be set=
 to automatically flush before the transaction completes, close after the t=
ransaction completes, and aggressively release JDBC connections after each =
statement. This allows the <literal>Session</literal>s to be managed by the=
 life cycle of the JTA transaction to which it is associated, keeping user =
code clean of su!
 ch management concerns. Your code can either use JTA programmatically thro=
ugh <literal>UserTransaction</literal>, or (recommended for portable code) =
use the Hibernate <literal>Transaction</literal> API to set transaction bou=
ndaries. If you run in an EJB container, declarative transaction demarcatio=
n with CMT is preferred."
 msgstr ""
 =

-#: configuration.xml:1669(title) =

+#. Tag: title
+#: configuration.xml:1628
+#, no-c-format
 msgid "JMX deployment"
 msgstr ""
 =

-#: configuration.xml:1671(para) =

+#. Tag: para
+#: configuration.xml:1630
+#, no-c-format
 msgid "The line <literal>cfg.buildSessionFactory()</literal> still has to =
be executed somewhere to get a <literal>SessionFactory</literal> into JNDI.=
 You can do this either in a <literal>static</literal> initializer block (l=
ike the one in <literal>HibernateUtil</literal>) or you deploy Hibernate as=
 a <emphasis>managed service</emphasis>."
 msgstr ""
 =

-#: configuration.xml:1679(para) =

+#. Tag: para
+#: configuration.xml:1638
+#, no-c-format
 msgid "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateS=
ervice</literal> for deployment on an application server with JMX capabilit=
ies, such as JBoss AS. The actual deployment and configuration is vendor sp=
ecific. Here is an example <literal>jboss-service.xml</literal> for JBoss 4=
.0.x:"
 msgstr ""
 =

-#: configuration.xml:1729(para) =

-msgid "This file is deployed in a directory called <literal>META-INF</lite=
ral> and packaged in a JAR file with the extension <literal>.sar</literal> =
(service archive). You also need to package Hibernate, its required third-p=
arty libraries, your compiled persistent classes, as well as your mapping f=
iles in the same archive. Your enterprise beans (usually session beans) may=
 be kept in their own JAR file, but you may include this EJB JAR file in th=
e main service archive to get a single (hot-)deployable unit. Consult the J=
Boss AS documentation for more information about JMX service and EJB deploy=
ment."
+#. Tag: programlisting
+#: configuration.xml:1645
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<server>\n"
+      "\n"
+      "<mbean code=3D\"org.hibernate.jmx.HibernateService\"\n"
+      "    name=3D\"jboss.jca:service=3DHibernateFactory,name=3DHibernateF=
actory\">\n"
+      "\n"
+      "    <!-- Required services -->\n"
+      "    <depends>jboss.jca:service=3DRARDeployer</depends>\n"
+      "    <depends>jboss.jca:service=3DLocalTxCM,name=3DHsqlDS</depends>\=
n"
+      "\n"
+      "    <!-- Bind the Hibernate service to JNDI -->\n"
+      "    <attribute name=3D\"JndiName\">java:/hibernate/SessionFactory</=
attribute>\n"
+      "\n"
+      "    <!-- Datasource settings -->\n"
+      "    <attribute name=3D\"Datasource\">java:HsqlDS</attribute>\n"
+      "    <attribute name=3D\"Dialect\">org.hibernate.dialect.HSQLDialect=
</attribute>\n"
+      "\n"
+      "    <!-- Transaction integration -->\n"
+      "    <attribute name=3D\"TransactionStrategy\">\n"
+      "        org.hibernate.transaction.JTATransactionFactory</attribute>=
\n"
+      "    <attribute name=3D\"TransactionManagerLookupStrategy\">\n"
+      "        org.hibernate.transaction.JBossTransactionManagerLookup</at=
tribute>\n"
+      "    <attribute name=3D\"FlushBeforeCompletionEnabled\">true</attrib=
ute>\n"
+      "    <attribute name=3D\"AutoCloseSessionEnabled\">true</attribute>\=
n"
+      "\n"
+      "    <!-- Fetching options -->\n"
+      "    <attribute name=3D\"MaximumFetchDepth\">5</attribute>\n"
+      "\n"
+      "    <!-- Second-level caching -->\n"
+      "    <attribute name=3D\"SecondLevelCacheEnabled\">true</attribute>\=
n"
+      "    <attribute name=3D\"CacheProviderClass\">org.hibernate.cache.Eh=
CacheProvider</attribute>\n"
+      "    <attribute name=3D\"QueryCacheEnabled\">true</attribute>\n"
+      "\n"
+      "    <!-- Logging -->\n"
+      "    <attribute name=3D\"ShowSqlEnabled\">true</attribute>\n"
+      "\n"
+      "    <!-- Mapping files -->\n"
+      "    <attribute name=3D\"MapResources\">auction/Item.hbm.xml,auction=
/Category.hbm.xml</attribute>\n"
+      "\n"
+      "</mbean>\n"
+      "\n"
+      "</server>]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: configuration.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: configuration.xml:1647
+#, no-c-format
+msgid "This file is deployed in a directory called <literal>META-INF</lite=
ral> and packaged in a JAR file with the extension <literal>.sar</literal> =
(service archive). You also need to package Hibernate, its required third-p=
arty libraries, your compiled persistent classes, as well as your mapping f=
iles in the same archive. Your enterprise beans (usually session beans) may=
 be kept in their own JAR file, but you may include this EJB JAR file in th=
e main service archive to get a single (hot-)deployable unit. Consult the J=
Boss AS documentation for more information about JMX service and EJB deploy=
ment."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/even=
ts.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot=
	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot=
	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,108 +1,311 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:31-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: events.xml:5(title) =

+#. Tag: title
+#: events.xml:29
+#, no-c-format
 msgid "Interceptors and events"
 msgstr ""
 =

-#: events.xml:7(para) =

+#. Tag: para
+#: events.xml:31
+#, no-c-format
 msgid "It is often useful for the application to react to certain events t=
hat occur inside Hibernate. This allows implementation of certain kinds of =
generic functionality, and extension of Hibernate functionality."
 msgstr ""
 =

-#: events.xml:14(title) =

+#. Tag: title
+#: events.xml:38
+#, no-c-format
 msgid "Interceptors"
 msgstr ""
 =

-#: events.xml:16(para) =

+#. Tag: para
+#: events.xml:40
+#, no-c-format
 msgid "The <literal>Interceptor</literal> interface provides callbacks fro=
m the session to the application allowing the application to inspect and/or=
 manipulate properties of a persistent object before it is saved, updated, =
deleted or loaded. One possible use for this is to track auditing informati=
on. For example, the following <literal>Interceptor</literal> automatically=
 sets the <literal>createTimestamp</literal> when an <literal>Auditable</li=
teral> is created and updates the <literal>lastUpdateTimestamp</literal> pr=
operty when an <literal>Auditable</literal> is updated."
 msgstr ""
 =

-#: events.xml:27(para) =

+#. Tag: para
+#: events.xml:51
+#, no-c-format
 msgid "You may either implement <literal>Interceptor</literal> directly or=
 (better) extend <literal>EmptyInterceptor</literal>."
 msgstr ""
 =

-#: events.xml:115(para) =

+#. Tag: programlisting
+#: events.xml:56
+#, no-c-format
+msgid ""
+      "<![CDATA[package org.hibernate.test;\n"
+      "\n"
+      "import java.io.Serializable;\n"
+      "import java.util.Date;\n"
+      "import java.util.Iterator;\n"
+      "\n"
+      "import org.hibernate.EmptyInterceptor;\n"
+      "import org.hibernate.Transaction;\n"
+      "import org.hibernate.type.Type;\n"
+      "\n"
+      "public class AuditInterceptor extends EmptyInterceptor {\n"
+      "\n"
+      "    private int updates;\n"
+      "    private int creates;\n"
+      "    private int loads;\n"
+      "\n"
+      "    public void onDelete(Object entity,\n"
+      "                         Serializable id,\n"
+      "                         Object[] state,\n"
+      "                         String[] propertyNames,\n"
+      "                         Type[] types) {\n"
+      "        // do nothing\n"
+      "    }\n"
+      "\n"
+      "    public boolean onFlushDirty(Object entity,\n"
+      "                                Serializable id,\n"
+      "                                Object[] currentState,\n"
+      "                                Object[] previousState,\n"
+      "                                String[] propertyNames,\n"
+      "                                Type[] types) {\n"
+      "\n"
+      "        if ( entity instanceof Auditable ) {\n"
+      "            updates++;\n"
+      "            for ( int i=3D0; i < propertyNames.length; i++ ) {\n"
+      "                if ( \"lastUpdateTimestamp\".equals( propertyNames[=
i] ) ) {\n"
+      "                    currentState[i] =3D new Date();\n"
+      "                    return true;\n"
+      "                }\n"
+      "            }\n"
+      "        }\n"
+      "        return false;\n"
+      "    }\n"
+      "\n"
+      "    public boolean onLoad(Object entity,\n"
+      "                          Serializable id,\n"
+      "                          Object[] state,\n"
+      "                          String[] propertyNames,\n"
+      "                          Type[] types) {\n"
+      "        if ( entity instanceof Auditable ) {\n"
+      "            loads++;\n"
+      "        }\n"
+      "        return false;\n"
+      "    }\n"
+      "\n"
+      "    public boolean onSave(Object entity,\n"
+      "                          Serializable id,\n"
+      "                          Object[] state,\n"
+      "                          String[] propertyNames,\n"
+      "                          Type[] types) {\n"
+      "\n"
+      "        if ( entity instanceof Auditable ) {\n"
+      "            creates++;\n"
+      "            for ( int i=3D0; i<propertyNames.length; i++ ) {\n"
+      "                if ( \"createTimestamp\".equals( propertyNames[i] )=
 ) {\n"
+      "                    state[i] =3D new Date();\n"
+      "                    return true;\n"
+      "                }\n"
+      "            }\n"
+      "        }\n"
+      "        return false;\n"
+      "    }\n"
+      "\n"
+      "    public void afterTransactionCompletion(Transaction tx) {\n"
+      "        if ( tx.wasCommitted() ) {\n"
+      "            System.out.println(\"Creations: \" + creates + \", Upda=
tes: \" + updates, \"Loads: \" + loads);\n"
+      "        }\n"
+      "        updates=3D0;\n"
+      "        creates=3D0;\n"
+      "        loads=3D0;\n"
+      "    }\n"
+      "\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:58
+#, no-c-format
 msgid "Interceptors come in two flavors: <literal>Session</literal>-scoped=
 and <literal>SessionFactory</literal>-scoped."
 msgstr ""
 =

-#: events.xml:120(para) =

+#. Tag: para
+#: events.xml:63
+#, no-c-format
 msgid "A <literal>Session</literal>-scoped interceptor is specified when a=
 session is opened using one of the overloaded SessionFactory.openSession()=
 methods accepting an <literal>Interceptor</literal>."
 msgstr ""
 =

-#: events.xml:128(para) =

+#. Tag: programlisting
+#: events.xml:69
+#, no-c-format
+msgid "<![CDATA[Session session =3D sf.openSession( new AuditInterceptor()=
 );]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:71
+#, no-c-format
 msgid "A <literal>SessionFactory</literal>-scoped interceptor is registere=
d with the <literal>Configuration</literal> object prior to building the <l=
iteral>SessionFactory</literal>. In this case, the supplied interceptor wil=
l be applied to all sessions opened from that <literal>SessionFactory</lite=
ral>; this is true unless a session is opened explicitly specifying the int=
erceptor to use. <literal>SessionFactory</literal>-scoped interceptors must=
 be thread safe, taking care to not store session-specific state since mult=
iple sessions will use this interceptor (potentially) concurrently."
 msgstr ""
 =

-#: events.xml:142(title) =

+#. Tag: programlisting
+#: events.xml:80
+#, no-c-format
+msgid "<![CDATA[new Configuration().setInterceptor( new AuditInterceptor()=
 );]]>"
+msgstr ""
+
+#. Tag: title
+#: events.xml:85
+#, no-c-format
 msgid "Event system"
 msgstr ""
 =

-#: events.xml:144(para) =

+#. Tag: para
+#: events.xml:87
+#, no-c-format
 msgid "If you have to react to particular events in your persistence layer=
, you may also use the Hibernate3 <emphasis>event</emphasis> architecture. =
The event system can be used in addition or as a replacement for intercepto=
rs."
 msgstr ""
 =

-#: events.xml:150(para) =

+#. Tag: para
+#: events.xml:93
+#, no-c-format
 msgid "Essentially all of the methods of the <literal>Session</literal> in=
terface correlate to an event. You have a <literal>LoadEvent</literal>, a <=
literal>FlushEvent</literal>, etc (consult the XML configuration-file DTD o=
r the <literal>org.hibernate.event</literal> package for the full list of d=
efined event types). When a request is made of one of these methods, the Hi=
bernate <literal>Session</literal> generates an appropriate event and passe=
s it to the configured event listeners for that type. Out-of-the-box, these=
 listeners implement the same processing in which those methods always resu=
lted. However, you are free to implement a customization of one of the list=
ener interfaces (i.e., the <literal>LoadEvent</literal> is processed by the=
 registered implemenation of the <literal>LoadEventListener</literal> inter=
face), in which case their implementation would be responsible for processi=
ng any <literal>load()</literal> requests made of the <literal>Session</lit=
eral>."
 msgstr ""
 =

-#: events.xml:165(para) =

+#. Tag: para
+#: events.xml:108
+#, no-c-format
 msgid "The listeners should be considered effectively singletons; meaning,=
 they are shared between requests, and thus should not save any state as in=
stance variables."
 msgstr ""
 =

-#: events.xml:170(para) =

+#. Tag: para
+#: events.xml:113
+#, no-c-format
 msgid "A custom listener should implement the appropriate interface for th=
e event it wants to process and/or extend one of the convenience base class=
es (or even the default event listeners used by Hibernate out-of-the-box as=
 these are declared non-final for this purpose). Custom listeners can eithe=
r be registered programmatically through the <literal>Configuration</litera=
l> object, or specified in the Hibernate configuration XML (declarative con=
figuration through the properties file is not supported). Here's an example=
 of a custom load event listener:"
 msgstr ""
 =

-#: events.xml:190(para) =

+#. Tag: programlisting
+#: events.xml:123
+#, no-c-format
+msgid ""
+      "<![CDATA[public class MyLoadListener implements LoadEventListener {=
\n"
+      "    // this is the single method defined by the LoadEventListener i=
nterface\n"
+      "    public void onLoad(LoadEvent event, LoadEventListener.LoadType =
loadType)\n"
+      "            throws HibernateException {\n"
+      "        if ( !MySecurity.isAuthorized( event.getEntityClassName(), =
event.getEntityId() ) ) {\n"
+      "            throw MySecurityException(\"Unauthorized access\");\n"
+      "        }\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:125
+#, no-c-format
 msgid "You also need a configuration entry telling Hibernate to use the li=
stener in addition to the default listener:"
 msgstr ""
 =

-#: events.xml:205(para) =

+#. Tag: programlisting
+#: events.xml:130
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-configuration>\n"
+      "    <session-factory>\n"
+      "        ...\n"
+      "        <event type=3D\"load\">\n"
+      "            <listener class=3D\"com.eg.MyLoadListener\"/>\n"
+      "            <listener class=3D\"org.hibernate.event.def.DefaultLoad=
EventListener\"/>\n"
+      "        </event>\n"
+      "    </session-factory>\n"
+      "</hibernate-configuration>]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:132
+#, no-c-format
 msgid "Instead, you may register it programmatically:"
 msgstr ""
 =

-#: events.xml:213(para) =

+#. Tag: programlisting
+#: events.xml:136
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D new Configuration();\n"
+      "LoadEventListener[] stack =3D { new MyLoadListener(), new DefaultLo=
adEventListener() };\n"
+      "cfg.EventListeners().setLoadEventListeners(stack);]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:138
+#, no-c-format
 msgid "Listeners registered declaratively cannot share instances. If the s=
ame class name is used in multiple <literal>&lt;listener/&gt;</literal> ele=
ments, each reference will result in a separate instance of that class. If =
you need the capability to share listener instances between listener types =
you must use the programmatic registration approach."
 msgstr ""
 =

-#: events.xml:221(para) =

+#. Tag: para
+#: events.xml:146
+#, no-c-format
 msgid "Why implement an interface and define the specific type during conf=
iguration? Well, a listener implementation could implement multiple event l=
istener interfaces. Having the type additionally defined during registratio=
n makes it easier to turn custom listeners on or off during configuration."
 msgstr ""
 =

-#: events.xml:231(title) =

+#. Tag: title
+#: events.xml:156
+#, no-c-format
 msgid "Hibernate declarative security"
 msgstr ""
 =

-#: events.xml:232(para) =

+#. Tag: para
+#: events.xml:157
+#, no-c-format
 msgid "Usually, declarative security in Hibernate applications is managed =
in a session facade layer. Now, Hibernate3 allows certain actions to be per=
missioned via JACC, and authorized via JAAS. This is optional functionality=
 built on top of the event architecture."
 msgstr ""
 =

-#: events.xml:238(para) =

+#. Tag: para
+#: events.xml:163
+#, no-c-format
 msgid "First, you must configure the appropriate event listeners, to enabl=
e the use of JAAS authorization."
 msgstr ""
 =

-#: events.xml:248(para) =

+#. Tag: programlisting
+#: events.xml:168
+#, no-c-format
+msgid ""
+      "<![CDATA[<listener type=3D\"pre-delete\" class=3D\"org.hibernate.se=
cure.JACCPreDeleteEventListener\"/>\n"
+      "<listener type=3D\"pre-update\" class=3D\"org.hibernate.secure.JACC=
PreUpdateEventListener\"/>\n"
+      "<listener type=3D\"pre-insert\" class=3D\"org.hibernate.secure.JACC=
PreInsertEventListener\"/>\n"
+      "<listener type=3D\"pre-load\" class=3D\"org.hibernate.secure.JACCPr=
eLoadEventListener\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: events.xml:170
+#, no-c-format
 msgid "Note that <literal>&lt;listener type=3D\"...\" class=3D\"...\"/&gt;=
</literal> is just a shorthand for <literal>&lt;event type=3D\"...\"&gt;&lt=
;listener class=3D\"...\"/&gt;&lt;/event&gt;</literal> when there is exactl=
y one listener for a particular event type."
 msgstr ""
 =

-#: events.xml:254(para) =

+#. Tag: para
+#: events.xml:176
+#, no-c-format
 msgid "Next, still in <literal>hibernate.cfg.xml</literal>, bind the permi=
ssions to roles:"
 msgstr ""
 =

-#: events.xml:261(para) =

-msgid "The role names are the roles understood by your JACC provider."
+#. Tag: programlisting
+#: events.xml:180
+#, no-c-format
+msgid ""
+      "<![CDATA[<grant role=3D\"admin\" entity-name=3D\"User\" actions=3D\=
"insert,update,read\"/>\n"
+      "<grant role=3D\"su\" entity-name=3D\"User\" actions=3D\"*\"/>]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: events.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: events.xml:182
+#, no-c-format
+msgid "The role names are the roles understood by your JACC provider."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/exam=
ple_mappings.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_ma=
ppings.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_ma=
ppings.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,122 +1,723 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:31-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: example_mappings.xml:39(None) example_mappings.xml:42(None) =

-msgid "@@image: '../images/EmployerEmployee.png'; md5=3D51e3da273e772b7def=
c753746eb5223f"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: example_mappings.xml:153(None) example_mappings.xml:156(None) =

-msgid "@@image: '../images/AuthorWork.png'; md5=3Dfdbc5f105890c04d206674e7=
df6af6cf"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated f=
or you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: example_mappings.xml:277(None) example_mappings.xml:280(None) =

-msgid "@@image: '../images/CustomerOrderProduct.png'; md5=3D39dcb639a19768=
4dc020904a3f9a4b3d"
-msgstr ""
-
-#: example_mappings.xml:20(title) =

+#. Tag: title
+#: example_mappings.xml:29
+#, no-c-format
 msgid "Example: Various Mappings"
 msgstr ""
 =

-#: example_mappings.xml:22(para) =

+#. Tag: para
+#: example_mappings.xml:31
+#, no-c-format
 msgid "This chapters shows off some more complex association mappings."
 msgstr ""
 =

-#: example_mappings.xml:27(title) =

+#. Tag: title
+#: example_mappings.xml:36
+#, no-c-format
 msgid "Employer/Employee"
 msgstr ""
 =

-#: example_mappings.xml:29(para) =

+#. Tag: para
+#: example_mappings.xml:38
+#, no-c-format
 msgid "The following model of the relationship between <literal>Employer</=
literal> and <literal>Employee</literal> uses an actual entity class (<lite=
ral>Employment</literal>) to represent the association. This is done becaus=
e there might be more than one period of employment for the same two partie=
s. Components are used to model monetary values and employee names."
 msgstr ""
 =

-#: example_mappings.xml:46(para) =

+#. Tag: para
+#: example_mappings.xml:55
+#, no-c-format
 msgid "Heres a possible mapping document:"
 msgstr ""
 =

-#: example_mappings.xml:99(para) =

+#. Tag: programlisting
+#: example_mappings.xml:59
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "        \n"
+      "    <class name=3D\"Employer\" table=3D\"employers\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\">\n"
+      "                <param name=3D\"sequence\">employer_id_seq</param>\=
n"
+      "            </generator>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Employment\" table=3D\"employment_periods\">\n"
+      "\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\">\n"
+      "                <param name=3D\"sequence\">employment_id_seq</param=
>\n"
+      "            </generator>\n"
+      "        </id>\n"
+      "        <property name=3D\"startDate\" column=3D\"start_date\"/>\n"
+      "        <property name=3D\"endDate\" column=3D\"end_date\"/>\n"
+      "\n"
+      "        <component name=3D\"hourlyRate\" class=3D\"MonetaryAmount\"=
>\n"
+      "            <property name=3D\"amount\">\n"
+      "                <column name=3D\"hourly_rate\" sql-type=3D\"NUMERIC=
(12, 2)\"/>\n"
+      "            </property>\n"
+      "            <property name=3D\"currency\" length=3D\"12\"/>\n"
+      "        </component>\n"
+      "\n"
+      "        <many-to-one name=3D\"employer\" column=3D\"employer_id\" n=
ot-null=3D\"true\"/>\n"
+      "        <many-to-one name=3D\"employee\" column=3D\"employee_id\" n=
ot-null=3D\"true\"/>\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Employee\" table=3D\"employees\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"sequence\">\n"
+      "                <param name=3D\"sequence\">employee_id_seq</param>\=
n"
+      "            </generator>\n"
+      "        </id>\n"
+      "        <property name=3D\"taxfileNumber\"/>\n"
+      "        <component name=3D\"name\" class=3D\"Name\">\n"
+      "            <property name=3D\"firstName\"/>\n"
+      "            <property name=3D\"initial\"/>\n"
+      "            <property name=3D\"lastName\"/>\n"
+      "        </component>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_mappings.xml:61
+#, no-c-format
 msgid "And heres the table schema generated by <literal>SchemaExport</lite=
ral>."
 msgstr ""
 =

-#: example_mappings.xml:140(title) =

+#. Tag: programlisting
+#: example_mappings.xml:65
+#, no-c-format
+msgid ""
+      "<![CDATA[create table employers (\n"
+      "    id BIGINT not null, \n"
+      "    name VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table employment_periods (\n"
+      "    id BIGINT not null,\n"
+      "    hourly_rate NUMERIC(12, 2),\n"
+      "    currency VARCHAR(12), \n"
+      "    employee_id BIGINT not null, \n"
+      "    employer_id BIGINT not null, \n"
+      "    end_date TIMESTAMP, \n"
+      "    start_date TIMESTAMP, \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table employees (\n"
+      "    id BIGINT not null, \n"
+      "    firstName VARCHAR(255), \n"
+      "    initial CHAR(1), \n"
+      "    lastName VARCHAR(255), \n"
+      "    taxfileNumber VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "alter table employment_periods \n"
+      "    add constraint employment_periodsFK0 foreign key (employer_id) =
references employers\n"
+      "alter table employment_periods \n"
+      "    add constraint employment_periodsFK1 foreign key (employee_id) =
references employees\n"
+      "create sequence employee_id_seq\n"
+      "create sequence employment_id_seq\n"
+      "create sequence employer_id_seq]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:70
+#, no-c-format
 msgid "Author/Work"
 msgstr ""
 =

-#: example_mappings.xml:142(para) =

+#. Tag: para
+#: example_mappings.xml:72
+#, no-c-format
 msgid "Consider the following model of the relationships between <literal>=
Work</literal>, <literal>Author</literal> and <literal>Person</literal>. We=
 represent the relationship between <literal>Work</literal> and <literal>Au=
thor</literal> as a many-to-many association. We choose to represent the re=
lationship between <literal>Author</literal> and <literal>Person</literal> =
as one-to-one association. Another possibility would be to have <literal>Au=
thor</literal> extend <literal>Person</literal>."
 msgstr ""
 =

-#: example_mappings.xml:160(para) =

+#. Tag: para
+#: example_mappings.xml:90
+#, no-c-format
 msgid "The following mapping document correctly represents these relations=
hips:"
 msgstr ""
 =

-#: example_mappings.xml:216(para) =

+#. Tag: programlisting
+#: example_mappings.xml:94
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Work\" table=3D\"works\" discriminator-value=3D=
\"W\">\n"
+      "\n"
+      "        <id name=3D\"id\" column=3D\"id\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <discriminator column=3D\"type\" type=3D\"character\"/>\n"
+      "\n"
+      "        <property name=3D\"title\"/>\n"
+      "        <set name=3D\"authors\" table=3D\"author_work\">\n"
+      "            <key column name=3D\"work_id\"/>\n"
+      "            <many-to-many class=3D\"Author\" column name=3D\"author=
_id\"/>\n"
+      "        </set>\n"
+      "\n"
+      "        <subclass name=3D\"Book\" discriminator-value=3D\"B\">\n"
+      "            <property name=3D\"text\"/>\n"
+      "        </subclass>\n"
+      "\n"
+      "        <subclass name=3D\"Song\" discriminator-value=3D\"S\">\n"
+      "            <property name=3D\"tempo\"/>\n"
+      "            <property name=3D\"genre\"/>\n"
+      "        </subclass>\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Author\" table=3D\"authors\">\n"
+      "\n"
+      "        <id name=3D\"id\" column=3D\"id\">\n"
+      "            <!-- The Author must have the same identifier as the Pe=
rson -->\n"
+      "            <generator class=3D\"assigned\"/> \n"
+      "        </id>\n"
+      "\n"
+      "        <property name=3D\"alias\"/>\n"
+      "        <one-to-one name=3D\"person\" constrained=3D\"true\"/>\n"
+      "\n"
+      "        <set name=3D\"works\" table=3D\"author_work\" inverse=3D\"t=
rue\">\n"
+      "            <key column=3D\"author_id\"/>\n"
+      "            <many-to-many class=3D\"Work\" column=3D\"work_id\"/>\n"
+      "        </set>\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Person\" table=3D\"persons\">\n"
+      "        <id name=3D\"id\" column=3D\"id\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_mappings.xml:96
+#, no-c-format
 msgid "There are four tables in this mapping. <literal>works</literal>, <l=
iteral>authors</literal> and <literal>persons</literal> hold work, author a=
nd person data respectively. <literal>author_work</literal> is an associati=
on table linking authors to works. Heres the table schema, as generated by =
<literal>SchemaExport</literal>."
 msgstr ""
 =

-#: example_mappings.xml:262(title) =

+#. Tag: programlisting
+#: example_mappings.xml:104
+#, no-c-format
+msgid ""
+      "<![CDATA[create table works (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    tempo FLOAT, \n"
+      "    genre VARCHAR(255), \n"
+      "    text INTEGER, \n"
+      "    title VARCHAR(255), \n"
+      "    type CHAR(1) not null, \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table author_work (\n"
+      "    author_id BIGINT not null, \n"
+      "    work_id BIGINT not null, \n"
+      "    primary key (work_id, author_id)\n"
+      ")\n"
+      "\n"
+      "create table authors (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    alias VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table persons (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    name VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "alter table authors \n"
+      "    add constraint authorsFK0 foreign key (id) references persons\n"
+      "alter table author_work \n"
+      "    add constraint author_workFK0 foreign key (author_id) reference=
s authors\n"
+      "alter table author_work\n"
+      "    add constraint author_workFK1 foreign key (work_id) references =
works]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:109
+#, no-c-format
 msgid "Customer/Order/Product"
 msgstr ""
 =

-#: example_mappings.xml:264(para) =

+#. Tag: para
+#: example_mappings.xml:111
+#, no-c-format
 msgid "Now consider a model of the relationships between <literal>Customer=
</literal>, <literal>Order</literal> and <literal>LineItem</literal> and <l=
iteral>Product</literal>. There is a one-to-many association between <liter=
al>Customer</literal> and <literal>Order</literal>, but how should we repre=
sent <literal>Order</literal> / <literal>LineItem</literal> / <literal>Prod=
uct</literal>? I've chosen to map <literal>LineItem</literal> as an associa=
tion class representing the many-to-many association between <literal>Order=
</literal> and <literal>Product</literal>. In Hibernate, this is called a c=
omposite element."
 msgstr ""
 =

-#: example_mappings.xml:284(para) =

+#. Tag: para
+#: example_mappings.xml:131
+#, no-c-format
 msgid "The mapping document:"
 msgstr ""
 =

-#: example_mappings.xml:326(para) =

+#. Tag: programlisting
+#: example_mappings.xml:135
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"Customer\" table=3D\"customers\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "        <set name=3D\"orders\" inverse=3D\"true\">\n"
+      "            <key column=3D\"customer_id\"/>\n"
+      "            <one-to-many class=3D\"Order\"/>\n"
+      "        </set>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Order\" table=3D\"orders\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"date\"/>\n"
+      "        <many-to-one name=3D\"customer\" column=3D\"customer_id\"/>=
\n"
+      "        <list name=3D\"lineItems\" table=3D\"line_items\">\n"
+      "            <key column=3D\"order_id\"/>\n"
+      "            <list-index column=3D\"line_number\"/>\n"
+      "            <composite-element class=3D\"LineItem\">\n"
+      "                <property name=3D\"quantity\"/>\n"
+      "                <many-to-one name=3D\"product\" column=3D\"product_=
id\"/>\n"
+      "            </composite-element>\n"
+      "        </list>\n"
+      "    </class>\n"
+      "\n"
+      "    <class name=3D\"Product\" table=3D\"products\">\n"
+      "        <id name=3D\"id\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"serialNumber\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_mappings.xml:137
+#, no-c-format
 msgid "<literal>customers</literal>, <literal>orders</literal>, <literal>l=
ine_items</literal> and <literal>products</literal> hold customer, order, o=
rder line item and product data respectively. <literal>line_items</literal>=
 also acts as an association table linking orders with products."
 msgstr ""
 =

-#: example_mappings.xml:370(title) =

+#. Tag: programlisting
+#: example_mappings.xml:144
+#, no-c-format
+msgid ""
+      "<![CDATA[create table customers (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    name VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table orders (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    customer_id BIGINT, \n"
+      "    date TIMESTAMP, \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "create table line_items (\n"
+      "    line_number INTEGER not null, \n"
+      "    order_id BIGINT not null, \n"
+      "    product_id BIGINT, \n"
+      "    quantity INTEGER, \n"
+      "    primary key (order_id, line_number)\n"
+      ")\n"
+      "\n"
+      "create table products (\n"
+      "    id BIGINT not null generated by default as identity, \n"
+      "    serialNumber VARCHAR(255), \n"
+      "    primary key (id)\n"
+      ")\n"
+      "\n"
+      "alter table orders \n"
+      "    add constraint ordersFK0 foreign key (customer_id) references c=
ustomers\n"
+      "alter table line_items\n"
+      "    add constraint line_itemsFK0 foreign key (product_id) reference=
s products\n"
+      "alter table line_items\n"
+      "    add constraint line_itemsFK1 foreign key (order_id) references =
orders]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:149
+#, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr ""
 =

-#: example_mappings.xml:372(para) =

+#. Tag: para
+#: example_mappings.xml:151
+#, no-c-format
 msgid "These examples are all taken from the Hibernate test suite. You wil=
l find many other useful example mappings there. Look in the <literal>test<=
/literal> folder of the Hibernate distribution."
 msgstr ""
 =

-#: example_mappings.xml:378(para) =

+#. Tag: para
+#: example_mappings.xml:157
+#, no-c-format
 msgid "TODO: put words around this stuff"
 msgstr ""
 =

-#: example_mappings.xml:381(title) =

+#. Tag: title
+#: example_mappings.xml:160
+#, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr ""
 =

-#: example_mappings.xml:411(title) =

+#. Tag: programlisting
+#: example_mappings.xml:161
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"name\"/>\n"
+      "    <one-to-one name=3D\"address\" \n"
+      "            cascade=3D\"all\">\n"
+      "        <formula>name</formula>\n"
+      "        <formula>'HOME'</formula>\n"
+      "    </one-to-one>\n"
+      "    <one-to-one name=3D\"mailingAddress\" \n"
+      "            cascade=3D\"all\">\n"
+      "        <formula>name</formula>\n"
+      "        <formula>'MAILING'</formula>\n"
+      "    </one-to-one>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\" batch-size=3D\"2\" \n"
+      "        check=3D\"addressType in ('MAILING', 'HOME', 'BUSINESS')\">=
\n"
+      "    <composite-id>\n"
+      "        <key-many-to-one name=3D\"person\" \n"
+      "                column=3D\"personName\"/>\n"
+      "        <key-property name=3D\"type\" \n"
+      "                column=3D\"addressType\"/>\n"
+      "    </composite-id>\n"
+      "    <property name=3D\"street\" type=3D\"text\"/>\n"
+      "    <property name=3D\"state\"/>\n"
+      "    <property name=3D\"zip\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:165
+#, no-c-format
 msgid "Composite key example"
 msgstr ""
 =

-#: example_mappings.xml:528(title) =

+#. Tag: programlisting
+#: example_mappings.xml:166
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Customer\">\n"
+      "\n"
+      "    <id name=3D\"customerId\"\n"
+      "        length=3D\"10\">\n"
+      "        <generator class=3D\"assigned\"/>\n"
+      "    </id>\n"
+      "\n"
+      "    <property name=3D\"name\" not-null=3D\"true\" length=3D\"100\"/=
>\n"
+      "    <property name=3D\"address\" not-null=3D\"true\" length=3D\"200=
\"/>\n"
+      "\n"
+      "    <list name=3D\"orders\"\n"
+      "            inverse=3D\"true\"\n"
+      "            cascade=3D\"save-update\">\n"
+      "        <key column=3D\"customerId\"/>\n"
+      "        <index column=3D\"orderNumber\"/>\n"
+      "        <one-to-many class=3D\"Order\"/>\n"
+      "    </list>\n"
+      "\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Order\" table=3D\"CustomerOrder\" lazy=3D\"true\">\=
n"
+      "    <synchronize table=3D\"LineItem\"/>\n"
+      "    <synchronize table=3D\"Product\"/>\n"
+      "    \n"
+      "    <composite-id name=3D\"id\" \n"
+      "            class=3D\"Order$Id\">\n"
+      "        <key-property name=3D\"customerId\" length=3D\"10\"/>\n"
+      "        <key-property name=3D\"orderNumber\"/>\n"
+      "    </composite-id>\n"
+      "    \n"
+      "    <property name=3D\"orderDate\" \n"
+      "            type=3D\"calendar_date\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "    \n"
+      "    <property name=3D\"total\">\n"
+      "        <formula>\n"
+      "            ( select sum(li.quantity*p.price) \n"
+      "            from LineItem li, Product p \n"
+      "            where li.productId =3D p.productId \n"
+      "                and li.customerId =3D customerId \n"
+      "                and li.orderNumber =3D orderNumber )\n"
+      "        </formula>\n"
+      "    </property>\n"
+      "    \n"
+      "    <many-to-one name=3D\"customer\"\n"
+      "            column=3D\"customerId\"\n"
+      "            insert=3D\"false\"\n"
+      "            update=3D\"false\" \n"
+      "            not-null=3D\"true\"/>\n"
+      "        \n"
+      "    <bag name=3D\"lineItems\"\n"
+      "            fetch=3D\"join\" \n"
+      "            inverse=3D\"true\"\n"
+      "            cascade=3D\"save-update\">\n"
+      "        <key>\n"
+      "            <column name=3D\"customerId\"/>\n"
+      "            <column name=3D\"orderNumber\"/>\n"
+      "        </key>\n"
+      "        <one-to-many class=3D\"LineItem\"/>\n"
+      "    </bag>\n"
+      "    \n"
+      "</class>\n"
+      "    \n"
+      "<class name=3D\"LineItem\">\n"
+      "    \n"
+      "    <composite-id name=3D\"id\" \n"
+      "            class=3D\"LineItem$Id\">\n"
+      "        <key-property name=3D\"customerId\" length=3D\"10\"/>\n"
+      "        <key-property name=3D\"orderNumber\"/>\n"
+      "        <key-property name=3D\"productId\" length=3D\"10\"/>\n"
+      "    </composite-id>\n"
+      "    \n"
+      "    <property name=3D\"quantity\"/>\n"
+      "    \n"
+      "    <many-to-one name=3D\"order\"\n"
+      "            insert=3D\"false\"\n"
+      "            update=3D\"false\" \n"
+      "            not-null=3D\"true\">\n"
+      "        <column name=3D\"customerId\"/>\n"
+      "        <column name=3D\"orderNumber\"/>\n"
+      "    </many-to-one>\n"
+      "    \n"
+      "    <many-to-one name=3D\"product\"\n"
+      "            insert=3D\"false\"\n"
+      "            update=3D\"false\" \n"
+      "            not-null=3D\"true\"\n"
+      "            column=3D\"productId\"/>\n"
+      "        \n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Product\">\n"
+      "    <synchronize table=3D\"LineItem\"/>\n"
+      "\n"
+      "    <id name=3D\"productId\"\n"
+      "        length=3D\"10\">\n"
+      "        <generator class=3D\"assigned\"/>\n"
+      "    </id>\n"
+      "    \n"
+      "    <property name=3D\"description\" \n"
+      "        not-null=3D\"true\" \n"
+      "        length=3D\"200\"/>\n"
+      "    <property name=3D\"price\" length=3D\"3\"/>\n"
+      "    <property name=3D\"numberAvailable\"/>\n"
+      "    \n"
+      "    <property name=3D\"numberOrdered\">\n"
+      "        <formula>\n"
+      "            ( select sum(li.quantity) \n"
+      "            from LineItem li \n"
+      "            where li.productId =3D productId )\n"
+      "        </formula>\n"
+      "    </property>\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:170
+#, no-c-format
 msgid "Many-to-many with shared composite key attribute"
 msgstr ""
 =

-#: example_mappings.xml:567(title) =

+#. Tag: programlisting
+#: example_mappings.xml:171
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"User\" table=3D\"`User`\">\n"
+      "    <composite-id>\n"
+      "        <key-property name=3D\"name\"/>\n"
+      "        <key-property name=3D\"org\"/>\n"
+      "    </composite-id>\n"
+      "    <set name=3D\"groups\" table=3D\"UserGroup\">\n"
+      "        <key>\n"
+      "            <column name=3D\"userName\"/>\n"
+      "            <column name=3D\"org\"/>\n"
+      "        </key>\n"
+      "        <many-to-many class=3D\"Group\">\n"
+      "            <column name=3D\"groupName\"/>\n"
+      "            <formula>org</formula>\n"
+      "        </many-to-many>\n"
+      "    </set>\n"
+      "</class>\n"
+      "    \n"
+      "<class name=3D\"Group\" table=3D\"`Group`\">\n"
+      "    <composite-id>\n"
+      "        <key-property name=3D\"name\"/>\n"
+      "        <key-property name=3D\"org\"/>\n"
+      "    </composite-id>\n"
+      "    <property name=3D\"description\"/>\n"
+      "    <set name=3D\"users\" table=3D\"UserGroup\" inverse=3D\"true\">=
\n"
+      "        <key>\n"
+      "            <column name=3D\"groupName\"/>\n"
+      "            <column name=3D\"org\"/>\n"
+      "        </key>\n"
+      "        <many-to-many class=3D\"User\">\n"
+      "            <column name=3D\"userName\"/>\n"
+      "            <formula>org</formula>\n"
+      "        </many-to-many>\n"
+      "    </set>\n"
+      "</class>\n"
+      "]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:175
+#, no-c-format
 msgid "Content based discrimination"
 msgstr ""
 =

-#: example_mappings.xml:621(title) =

+#. Tag: programlisting
+#: example_mappings.xml:176
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\"\n"
+      "    discriminator-value=3D\"P\">\n"
+      "    \n"
+      "    <id name=3D\"id\" \n"
+      "        column=3D\"person_id\" \n"
+      "        unsaved-value=3D\"0\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    \n"
+      "            \n"
+      "    <discriminator \n"
+      "        type=3D\"character\">\n"
+      "        <formula>\n"
+      "            case \n"
+      "                when title is not null then 'E' \n"
+      "                when salesperson is not null then 'C' \n"
+      "                else 'P' \n"
+      "            end\n"
+      "        </formula>\n"
+      "    </discriminator>\n"
+      "\n"
+      "    <property name=3D\"name\" \n"
+      "        not-null=3D\"true\"\n"
+      "        length=3D\"80\"/>\n"
+      "        \n"
+      "    <property name=3D\"sex\" \n"
+      "        not-null=3D\"true\"\n"
+      "        update=3D\"false\"/>\n"
+      "    \n"
+      "    <component name=3D\"address\">\n"
+      "        <property name=3D\"address\"/>\n"
+      "        <property name=3D\"zip\"/>\n"
+      "        <property name=3D\"country\"/>\n"
+      "    </component>\n"
+      "    \n"
+      "    <subclass name=3D\"Employee\" \n"
+      "        discriminator-value=3D\"E\">\n"
+      "            <property name=3D\"title\"\n"
+      "                length=3D\"20\"/>\n"
+      "            <property name=3D\"salary\"/>\n"
+      "            <many-to-one name=3D\"manager\"/>\n"
+      "    </subclass>\n"
+      "    \n"
+      "    <subclass name=3D\"Customer\" \n"
+      "        discriminator-value=3D\"C\">\n"
+      "            <property name=3D\"comments\"/>\n"
+      "            <many-to-one name=3D\"salesperson\"/>\n"
+      "    </subclass>\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: example_mappings.xml:180
+#, no-c-format
 msgid "Associations on alternate keys"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: example_mappings.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: example_mappings.xml:181
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    \n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"hilo\"/>\n"
+      "    </id>\n"
+      "    \n"
+      "    <property name=3D\"name\" length=3D\"100\"/>\n"
+      "    \n"
+      "    <one-to-one name=3D\"address\" \n"
+      "        property-ref=3D\"person\"\n"
+      "        cascade=3D\"all\"\n"
+      "        fetch=3D\"join\"/>\n"
+      "    \n"
+      "    <set name=3D\"accounts\" \n"
+      "        inverse=3D\"true\">\n"
+      "        <key column=3D\"userId\"\n"
+      "            property-ref=3D\"userId\"/>\n"
+      "        <one-to-many class=3D\"Account\"/>\n"
+      "    </set>\n"
+      "    \n"
+      "    <property name=3D\"userId\" length=3D\"8\"/>\n"
+      "\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Address\">\n"
+      "\n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"hilo\"/>\n"
+      "    </id>\n"
+      "\n"
+      "    <property name=3D\"address\" length=3D\"300\"/>\n"
+      "    <property name=3D\"zip\" length=3D\"5\"/>\n"
+      "    <property name=3D\"country\" length=3D\"25\"/>\n"
+      "    <many-to-one name=3D\"person\" unique=3D\"true\" not-null=3D\"t=
rue\"/>\n"
+      "\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Account\">\n"
+      "    <id name=3D\"accountId\" length=3D\"32\">\n"
+      "        <generator class=3D\"uuid\"/>\n"
+      "    </id>\n"
+      "    \n"
+      "    <many-to-one name=3D\"user\"\n"
+      "        column=3D\"userId\"\n"
+      "        property-ref=3D\"userId\"/>\n"
+      "    \n"
+      "    <property name=3D\"type\" not-null=3D\"true\"/>\n"
+      "    \n"
+      "</class>]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/exam=
ple_parentchild.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_pa=
rentchild.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_pa=
rentchild.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,168 +1,397 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:31-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: example_parentchild.xml:5(title) =

+#. Tag: title
+#: example_parentchild.xml:29
+#, no-c-format
 msgid "Example: Parent/Child"
 msgstr ""
 =

-#: example_parentchild.xml:7(para) =

+#. Tag: para
+#: example_parentchild.xml:31
+#, no-c-format
 msgid "One of the very first things that new users try to do with Hibernat=
e is to model a parent / child type relationship. There are two different a=
pproaches to this. For various reasons the most convenient approach, especi=
ally for new users, is to model both <literal>Parent</literal> and <literal=
>Child</literal> as entity classes with a <literal>&lt;one-to-many&gt;</lit=
eral> association from <literal>Parent</literal> to <literal>Child</literal=
>. (The alternative approach is to declare the <literal>Child</literal> as =
a <literal>&lt;composite-element&gt;</literal>.) Now, it turns out that def=
ault semantics of a one to many association (in Hibernate) are much less cl=
ose to the usual semantics of a parent / child relationship than those of a=
 composite element mapping. We will explain how to use a <emphasis>bidirect=
ional one to many association with cascades</emphasis> to model a parent / =
child relationship efficiently and elegantly. It's not at all difficult!"
 msgstr ""
 =

-#: example_parentchild.xml:21(title) =

+#. Tag: title
+#: example_parentchild.xml:45
+#, no-c-format
 msgid "A note about collections"
 msgstr ""
 =

-#: example_parentchild.xml:23(para) =

+#. Tag: para
+#: example_parentchild.xml:47
+#, no-c-format
 msgid "Hibernate collections are considered to be a logical part of their =
owning entity; never of the contained entities. This is a crucial distincti=
on! It has the following consequences:"
 msgstr ""
 =

-#: example_parentchild.xml:30(para) =

+#. Tag: para
+#: example_parentchild.xml:54
+#, no-c-format
 msgid "When we remove / add an object from / to a collection, the version =
number of the collection owner is incremented."
 msgstr ""
 =

-#: example_parentchild.xml:36(para) =

+#. Tag: para
+#: example_parentchild.xml:60
+#, no-c-format
 msgid "If an object that was removed from a collection is an instance of a=
 value type (eg, a composite element), that object will cease to be persist=
ent and its state will be completely removed from the database. Likewise, a=
dding a value type instance to the collection will cause its state to be im=
mediately persistent."
 msgstr ""
 =

-#: example_parentchild.xml:44(para) =

+#. Tag: para
+#: example_parentchild.xml:68
+#, no-c-format
 msgid "On the other hand, if an entity is removed from a collection (a one=
-to-many or many-to-many association), it will not be deleted, by default. =
This behaviour is completely consistent - a change to the internal state of=
 another entity should not cause the associated entity to vanish! Likewise,=
 adding an entity to a collection does not cause that entity to become pers=
istent, by default."
 msgstr ""
 =

-#: example_parentchild.xml:54(para) =

+#. Tag: para
+#: example_parentchild.xml:78
+#, no-c-format
 msgid "Instead, the default behaviour is that adding an entity to a collec=
tion merely creates a link between the two entities, while removing it remo=
ves the link. This is very appropriate for all sorts of cases. Where it is =
not appropriate at all is the case of a parent / child relationship, where =
the life of the child is bound to the life cycle of the parent."
 msgstr ""
 =

-#: example_parentchild.xml:64(title) =

+#. Tag: title
+#: example_parentchild.xml:88
+#, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr ""
 =

-#: example_parentchild.xml:66(para) =

+#. Tag: para
+#: example_parentchild.xml:90
+#, no-c-format
 msgid "Suppose we start with a simple <literal>&lt;one-to-many&gt;</litera=
l> association from <literal>Parent</literal> to <literal>Child</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:76(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:95
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"children\">\n"
+      "    <key column=3D\"parent_id\"/>\n"
+      "    <one-to-many class=3D\"Child\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:97
+#, no-c-format
 msgid "If we were to execute the following code"
 msgstr ""
 =

-#: example_parentchild.xml:86(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:101
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D .....;\n"
+      "Child c =3D new Child();\n"
+      "p.getChildren().add(c);\n"
+      "session.save(c);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:103
+#, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr ""
 =

-#: example_parentchild.xml:92(para) =

+#. Tag: para
+#: example_parentchild.xml:109
+#, no-c-format
 msgid "an <literal>INSERT</literal> to create the record for <literal>c</l=
iteral>"
 msgstr ""
 =

-#: example_parentchild.xml:95(para) =

+#. Tag: para
+#: example_parentchild.xml:112
+#, no-c-format
 msgid "an <literal>UPDATE</literal> to create the link from <literal>p</li=
teral> to <literal>c</literal>"
 msgstr ""
 =

-#: example_parentchild.xml:102(para) =

+#. Tag: para
+#: example_parentchild.xml:119
+#, no-c-format
 msgid "This is not only inefficient, but also violates any <literal>NOT NU=
LL</literal> constraint on the <literal>parent_id</literal> column. We can =
fix the nullability constraint violation by specifying <literal>not-null=3D=
\"true\"</literal> in the collection mapping:"
 msgstr ""
 =

-#: example_parentchild.xml:113(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:125
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"children\">\n"
+      "    <key column=3D\"parent_id\" not-null=3D\"true\"/>\n"
+      "    <one-to-many class=3D\"Child\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:127
+#, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr ""
 =

-#: example_parentchild.xml:116(para) =

+#. Tag: para
+#: example_parentchild.xml:130
+#, no-c-format
 msgid "The underlying cause of this behaviour is that the link (the foreig=
n key <literal>parent_id</literal>) from <literal>p</literal> to <literal>c=
</literal> is not considered part of the state of the <literal>Child</liter=
al> object and is therefore not created in the <literal>INSERT</literal>. S=
o the solution is to make the link part of the <literal>Child</literal> map=
ping."
 msgstr ""
 =

-#: example_parentchild.xml:125(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:137
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"parent\" column=3D\"parent_id\" not-=
null=3D\"true\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:139
+#, no-c-format
 msgid "(We also need to add the <literal>parent</literal> property to the =
<literal>Child</literal> class.)"
 msgstr ""
 =

-#: example_parentchild.xml:129(para) =

+#. Tag: para
+#: example_parentchild.xml:143
+#, no-c-format
 msgid "Now that the <literal>Child</literal> entity is managing the state =
of the link, we tell the collection not to update the link. We use the <lit=
eral>inverse</literal> attribute."
 msgstr ""
 =

-#: example_parentchild.xml:139(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:148
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"children\" inverse=3D\"true\">\n"
+      "    <key column=3D\"parent_id\"/>\n"
+      "    <one-to-many class=3D\"Child\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:150
+#, no-c-format
 msgid "The following code would be used to add a new <literal>Child</liter=
al>"
 msgstr ""
 =

-#: example_parentchild.xml:150(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:154
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "Child c =3D new Child();\n"
+      "c.setParent(p);\n"
+      "p.getChildren().add(c);\n"
+      "session.save(c);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:156
+#, no-c-format
 msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
 msgstr ""
 =

-#: example_parentchild.xml:154(para) =

+#. Tag: para
+#: example_parentchild.xml:160
+#, no-c-format
 msgid "To tighten things up a bit, we could create an <literal>addChild()<=
/literal> method of <literal>Parent</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:164(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:165
+#, no-c-format
+msgid ""
+      "<![CDATA[public void addChild(Child c) {\n"
+      "    c.setParent(this);\n"
+      "    children.add(c);\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:167
+#, no-c-format
 msgid "Now, the code to add a <literal>Child</literal> looks like"
 msgstr ""
 =

-#: example_parentchild.xml:177(title) =

+#. Tag: programlisting
+#: example_parentchild.xml:171
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "Child c =3D new Child();\n"
+      "p.addChild(c);\n"
+      "session.save(c);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: title
+#: example_parentchild.xml:176
+#, no-c-format
 msgid "Cascading life cycle"
 msgstr ""
 =

-#: example_parentchild.xml:179(para) =

+#. Tag: para
+#: example_parentchild.xml:178
+#, no-c-format
 msgid "The explicit call to <literal>save()</literal> is still annoying. W=
e will address this by using cascades."
 msgstr ""
 =

-#: example_parentchild.xml:189(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:183
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"children\" inverse=3D\"true\" cascade=3D\"al=
l\">\n"
+      "    <key column=3D\"parent_id\"/>\n"
+      "    <one-to-many class=3D\"Child\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:185
+#, no-c-format
 msgid "This simplifies the code above to"
 msgstr ""
 =

-#: example_parentchild.xml:198(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:189
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "Child c =3D new Child();\n"
+      "p.addChild(c);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:191
+#, no-c-format
 msgid "Similarly, we don't need to iterate over the children when saving o=
r deleting a <literal>Parent</literal>. The following removes <literal>p</l=
iteral> and all its children from the database."
 msgstr ""
 =

-#: example_parentchild.xml:207(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:196
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "session.delete(p);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:198
+#, no-c-format
 msgid "However, this code"
 msgstr ""
 =

-#: example_parentchild.xml:217(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:202
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "Child c =3D (Child) p.getChildren().iterator().next();\n"
+      "p.getChildren().remove(c);\n"
+      "c.setParent(null);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:204
+#, no-c-format
 msgid "will not remove <literal>c</literal> from the database; it will ony=
 remove the link to <literal>p</literal> (and cause a <literal>NOT NULL</li=
teral> constraint violation, in this case). You need to explicitly <literal=
>delete()</literal> the <literal>Child</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:229(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:210
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) session.load(Parent.class, pid);\n"
+      "Child c =3D (Child) p.getChildren().iterator().next();\n"
+      "p.getChildren().remove(c);\n"
+      "session.delete(c);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:212
+#, no-c-format
 msgid "Now, in our case, a <literal>Child</literal> can't really exist wit=
hout its parent. So if we remove a <literal>Child</literal> from the collec=
tion, we really do want it to be deleted. For this, we must use <literal>ca=
scade=3D\"all-delete-orphan\"</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:240(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:218
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"children\" inverse=3D\"true\" cascade=3D\"al=
l-delete-orphan\">\n"
+      "    <key column=3D\"parent_id\"/>\n"
+      "    <one-to-many class=3D\"Child\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:220
+#, no-c-format
 msgid "Note: even though the collection mapping specifies <literal>inverse=
=3D\"true\"</literal>, cascades are still processed by iterating the collec=
tion elements. So if you require that an object be saved, deleted or update=
d by cascade, you must add it to the collection. It is not enough to simply=
 call <literal>setParent()</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:250(title) =

+#. Tag: title
+#: example_parentchild.xml:230
+#, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr ""
 =

-#: example_parentchild.xml:252(para) =

+#. Tag: para
+#: example_parentchild.xml:232
+#, no-c-format
 msgid "Suppose we loaded up a <literal>Parent</literal> in one <literal>Se=
ssion</literal>, made some changes in a UI action and wish to persist these=
 changes in a new session by calling <literal>update()</literal>. The <lite=
ral>Parent</literal> will contain a collection of childen and, since cascad=
ing update is enabled, Hibernate needs to know which children are newly ins=
tantiated and which represent existing rows in the database. Lets assume th=
at both <literal>Parent</literal> and <literal>Child</literal> have genener=
ated identifier properties of type <literal>Long</literal>. Hibernate will =
use the identifier and version/timestamp property value to determine which =
of the children are new. (See <xref linkend=3D\"objectstate-saveorupdate\"/=
>.) <emphasis>In Hibernate3, it is no longer necessary to specify an <liter=
al>unsaved-value</literal> explicitly.</emphasis>"
 msgstr ""
 =

-#: example_parentchild.xml:264(para) =

+#. Tag: para
+#: example_parentchild.xml:244
+#, no-c-format
 msgid "The following code will update <literal>parent</literal> and <liter=
al>child</literal> and insert <literal>newChild</literal>."
 msgstr ""
 =

-#: example_parentchild.xml:276(para) =

+#. Tag: programlisting
+#: example_parentchild.xml:249
+#, no-c-format
+msgid ""
+      "<![CDATA[//parent and child were both loaded in a previous session\=
n"
+      "parent.addChild(child);\n"
+      "Child newChild =3D new Child();\n"
+      "parent.addChild(newChild);\n"
+      "session.update(parent);\n"
+      "session.flush();]]>"
+msgstr ""
+
+#. Tag: para
+#: example_parentchild.xml:251
+#, no-c-format
 msgid "Well, that's all very well for the case of a generated identifier, =
but what about assigned identifiers and composite identifiers? This is more=
 difficult, since Hibernate can't use the identifier property to distinguis=
h between a newly instantiated object (with an identifier assigned by the u=
ser) and an object loaded in a previous session. In this case, Hibernate wi=
ll either use the timestamp or version property, or will actually query the=
 second-level cache or, worst case, the database, to see if the row exists."
 msgstr ""
 =

-#: example_parentchild.xml:348(title) =

+#. Tag: title
+#: example_parentchild.xml:284
+#, no-c-format
 msgid "Conclusion"
 msgstr ""
 =

-#: example_parentchild.xml:350(para) =

+#. Tag: para
+#: example_parentchild.xml:286
+#, no-c-format
 msgid "There is quite a bit to digest here and it might look confusing fir=
st time around. However, in practice, it all works out very nicely. Most Hi=
bernate applications use the parent / child pattern in many places."
 msgstr ""
 =

-#: example_parentchild.xml:355(para) =

+#. Tag: para
+#: example_parentchild.xml:291
+#, no-c-format
 msgid "We mentioned an alternative in the first paragraph. None of the abo=
ve issues exist in the case of <literal>&lt;composite-element&gt;</literal>=
 mappings, which have exactly the semantics of a parent / child relationshi=
p. Unfortunately, there are two big limitations to composite element classe=
s: composite elements may not own collections, and they should not be the c=
hild of any entity other than the unique parent."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: example_parentchild.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/exam=
ple_weblog.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_we=
blog.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_we=
blog.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,44 +1,478 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:32-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: example_weblog.xml:5(title) =

+#. Tag: title
+#: example_weblog.xml:29
+#, no-c-format
 msgid "Example: Weblog Application"
 msgstr ""
 =

-#: example_weblog.xml:8(title) =

+#. Tag: title
+#: example_weblog.xml:32
+#, no-c-format
 msgid "Persistent Classes"
 msgstr ""
 =

-#: example_weblog.xml:10(para) =

+#. Tag: para
+#: example_weblog.xml:34
+#, no-c-format
 msgid "The persistent classes represent a weblog, and an item posted in a =
weblog. They are to be modelled as a standard parent/child relationship, bu=
t we will use an ordered bag, instead of a set."
 msgstr ""
 =

-#: example_weblog.xml:92(title) =

+#. Tag: programlisting
+#: example_weblog.xml:40
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "\n"
+      "import java.util.List;\n"
+      "\n"
+      "public class Blog {\n"
+      "    private Long _id;\n"
+      "    private String _name;\n"
+      "    private List _items;\n"
+      "\n"
+      "    public Long getId() {\n"
+      "        return _id;\n"
+      "    }\n"
+      "    public List getItems() {\n"
+      "        return _items;\n"
+      "    }\n"
+      "    public String getName() {\n"
+      "        return _name;\n"
+      "    }\n"
+      "    public void setId(Long long1) {\n"
+      "        _id =3D long1;\n"
+      "    }\n"
+      "    public void setItems(List list) {\n"
+      "        _items =3D list;\n"
+      "    }\n"
+      "    public void setName(String string) {\n"
+      "        _name =3D string;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: example_weblog.xml:42
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "\n"
+      "import java.text.DateFormat;\n"
+      "import java.util.Calendar;\n"
+      "\n"
+      "public class BlogItem {\n"
+      "    private Long _id;\n"
+      "    private Calendar _datetime;\n"
+      "    private String _text;\n"
+      "    private String _title;\n"
+      "    private Blog _blog;\n"
+      "\n"
+      "    public Blog getBlog() {\n"
+      "        return _blog;\n"
+      "    }\n"
+      "    public Calendar getDatetime() {\n"
+      "        return _datetime;\n"
+      "    }\n"
+      "    public Long getId() {\n"
+      "        return _id;\n"
+      "    }\n"
+      "    public String getText() {\n"
+      "        return _text;\n"
+      "    }\n"
+      "    public String getTitle() {\n"
+      "        return _title;\n"
+      "    }\n"
+      "    public void setBlog(Blog blog) {\n"
+      "        _blog =3D blog;\n"
+      "    }\n"
+      "    public void setDatetime(Calendar calendar) {\n"
+      "        _datetime =3D calendar;\n"
+      "    }\n"
+      "    public void setId(Long long1) {\n"
+      "        _id =3D long1;\n"
+      "    }\n"
+      "    public void setText(String string) {\n"
+      "        _text =3D string;\n"
+      "    }\n"
+      "    public void setTitle(String string) {\n"
+      "        _title =3D string;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: example_weblog.xml:47
+#, no-c-format
 msgid "Hibernate Mappings"
 msgstr ""
 =

-#: example_weblog.xml:94(para) =

+#. Tag: para
+#: example_weblog.xml:49
+#, no-c-format
 msgid "The XML mappings should now be quite straightforward."
 msgstr ""
 =

-#: example_weblog.xml:185(title) =

+#. Tag: programlisting
+#: example_weblog.xml:53
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "    \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
+      "    \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">=
\n"
+      "\n"
+      "<hibernate-mapping package=3D\"eg\">\n"
+      "\n"
+      "    <class\n"
+      "        name=3D\"Blog\"\n"
+      "        table=3D\"BLOGS\">\n"
+      "\n"
+      "        <id\n"
+      "            name=3D\"id\"\n"
+      "            column=3D\"BLOG_ID\">\n"
+      "\n"
+      "            <generator class=3D\"native\"/>\n"
+      "\n"
+      "        </id>\n"
+      "\n"
+      "        <property\n"
+      "            name=3D\"name\"\n"
+      "            column=3D\"NAME\"\n"
+      "            not-null=3D\"true\"\n"
+      "            unique=3D\"true\"/>\n"
+      "\n"
+      "        <bag\n"
+      "            name=3D\"items\"\n"
+      "            inverse=3D\"true\"\n"
+      "            order-by=3D\"DATE_TIME\"\n"
+      "            cascade=3D\"all\">\n"
+      "\n"
+      "            <key column=3D\"BLOG_ID\"/>\n"
+      "            <one-to-many class=3D\"BlogItem\"/>\n"
+      "\n"
+      "        </bag>\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: example_weblog.xml:55
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "    \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
+      "    \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">=
\n"
+      "\n"
+      "<hibernate-mapping package=3D\"eg\">\n"
+      "\n"
+      "    <class\n"
+      "        name=3D\"BlogItem\"\n"
+      "        table=3D\"BLOG_ITEMS\"\n"
+      "        dynamic-update=3D\"true\">\n"
+      "\n"
+      "        <id\n"
+      "            name=3D\"id\"\n"
+      "            column=3D\"BLOG_ITEM_ID\">\n"
+      "\n"
+      "            <generator class=3D\"native\"/>\n"
+      "\n"
+      "        </id>\n"
+      "\n"
+      "        <property\n"
+      "            name=3D\"title\"\n"
+      "            column=3D\"TITLE\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "\n"
+      "        <property\n"
+      "            name=3D\"text\"\n"
+      "            column=3D\"TEXT\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "\n"
+      "        <property\n"
+      "            name=3D\"datetime\"\n"
+      "            column=3D\"DATE_TIME\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "\n"
+      "        <many-to-one\n"
+      "            name=3D\"blog\"\n"
+      "            column=3D\"BLOG_ID\"\n"
+      "            not-null=3D\"true\"/>\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: title
+#: example_weblog.xml:60
+#, no-c-format
 msgid "Hibernate Code"
 msgstr ""
 =

-#: example_weblog.xml:187(para) =

+#. Tag: para
+#: example_weblog.xml:62
+#, no-c-format
 msgid "The following class demonstrates some of the kinds of things we can=
 do with these classes, using Hibernate."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: example_weblog.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: example_weblog.xml:67
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "\n"
+      "import java.util.ArrayList;\n"
+      "import java.util.Calendar;\n"
+      "import java.util.Iterator;\n"
+      "import java.util.List;\n"
+      "\n"
+      "import org.hibernate.HibernateException;\n"
+      "import org.hibernate.Query;\n"
+      "import org.hibernate.Session;\n"
+      "import org.hibernate.SessionFactory;\n"
+      "import org.hibernate.Transaction;\n"
+      "import org.hibernate.cfg.Configuration;\n"
+      "import org.hibernate.tool.hbm2ddl.SchemaExport;\n"
+      "\n"
+      "public class BlogMain {\n"
+      "    \n"
+      "    private SessionFactory _sessions;\n"
+      "    \n"
+      "    public void configure() throws HibernateException {\n"
+      "        _sessions =3D new Configuration()\n"
+      "            .addClass(Blog.class)\n"
+      "            .addClass(BlogItem.class)\n"
+      "            .buildSessionFactory();\n"
+      "    }\n"
+      "    \n"
+      "    public void exportTables() throws HibernateException {\n"
+      "        Configuration cfg =3D new Configuration()\n"
+      "            .addClass(Blog.class)\n"
+      "            .addClass(BlogItem.class);\n"
+      "        new SchemaExport(cfg).create(true, true);\n"
+      "    }\n"
+      "    \n"
+      "    public Blog createBlog(String name) throws HibernateException {=
\n"
+      "        \n"
+      "        Blog blog =3D new Blog();\n"
+      "        blog.setName(name);\n"
+      "        blog.setItems( new ArrayList() );\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            session.persist(blog);\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return blog;\n"
+      "    }\n"
+      "    \n"
+      "    public BlogItem createBlogItem(Blog blog, String title, String =
text)\n"
+      "                        throws HibernateException {\n"
+      "        \n"
+      "        BlogItem item =3D new BlogItem();\n"
+      "        item.setTitle(title);\n"
+      "        item.setText(text);\n"
+      "        item.setBlog(blog);\n"
+      "        item.setDatetime( Calendar.getInstance() );\n"
+      "        blog.getItems().add(item);\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            session.update(blog);\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return item;\n"
+      "    }\n"
+      "    \n"
+      "    public BlogItem createBlogItem(Long blogid, String title, Strin=
g text)\n"
+      "                        throws HibernateException {\n"
+      "        \n"
+      "        BlogItem item =3D new BlogItem();\n"
+      "        item.setTitle(title);\n"
+      "        item.setText(text);\n"
+      "        item.setDatetime( Calendar.getInstance() );\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            Blog blog =3D (Blog) session.load(Blog.class, blogid);\=
n"
+      "            item.setBlog(blog);\n"
+      "            blog.getItems().add(item);\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return item;\n"
+      "    }\n"
+      "    \n"
+      "    public void updateBlogItem(BlogItem item, String text)\n"
+      "                    throws HibernateException {\n"
+      "        \n"
+      "        item.setText(text);\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            session.update(item);\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "    }\n"
+      "    \n"
+      "    public void updateBlogItem(Long itemid, String text)\n"
+      "                    throws HibernateException {\n"
+      "    \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            BlogItem item =3D (BlogItem) session.load(BlogItem.clas=
s, itemid);\n"
+      "            item.setText(text);\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "    }\n"
+      "    \n"
+      "    public List listAllBlogNamesAndItemCounts(int max)\n"
+      "                    throws HibernateException {\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        List result =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            Query q =3D session.createQuery(\n"
+      "                \"select blog.id, blog.name, count(blogItem) \" +\n"
+      "                \"from Blog as blog \" +\n"
+      "                \"left outer join blog.items as blogItem \" +\n"
+      "                \"group by blog.name, blog.id \" +\n"
+      "                \"order by max(blogItem.datetime)\"\n"
+      "            );\n"
+      "            q.setMaxResults(max);\n"
+      "            result =3D q.list();\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return result;\n"
+      "    }\n"
+      "    \n"
+      "    public Blog getBlogAndAllItems(Long blogid)\n"
+      "                    throws HibernateException {\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        Blog blog =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            Query q =3D session.createQuery(\n"
+      "                \"from Blog as blog \" +\n"
+      "                \"left outer join fetch blog.items \" +\n"
+      "                \"where blog.id =3D :blogid\"\n"
+      "            );\n"
+      "            q.setParameter(\"blogid\", blogid);\n"
+      "            blog  =3D (Blog) q.uniqueResult();\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return blog;\n"
+      "    }\n"
+      "    \n"
+      "    public List listBlogsAndRecentItems() throws HibernateException=
 {\n"
+      "        \n"
+      "        Session session =3D _sessions.openSession();\n"
+      "        Transaction tx =3D null;\n"
+      "        List result =3D null;\n"
+      "        try {\n"
+      "            tx =3D session.beginTransaction();\n"
+      "            Query q =3D session.createQuery(\n"
+      "                \"from Blog as blog \" +\n"
+      "                \"inner join blog.items as blogItem \" +\n"
+      "                \"where blogItem.datetime > :minDate\"\n"
+      "            );\n"
+      "\n"
+      "            Calendar cal =3D Calendar.getInstance();\n"
+      "            cal.roll(Calendar.MONTH, false);\n"
+      "            q.setCalendar(\"minDate\", cal);\n"
+      "            \n"
+      "            result =3D q.list();\n"
+      "            tx.commit();\n"
+      "        }\n"
+      "        catch (HibernateException he) {\n"
+      "            if (tx!=3Dnull) tx.rollback();\n"
+      "            throw he;\n"
+      "        }\n"
+      "        finally {\n"
+      "            session.close();\n"
+      "        }\n"
+      "        return result;\n"
+      "    }\n"
+      "}]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/filt=
ers.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/filters.po=
t	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/filters.po=
t	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,80 +1,199 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:32-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: filters.xml:5(title) =

+#. Tag: title
+#: filters.xml:29
+#, no-c-format
 msgid "Filtering data"
 msgstr ""
 =

-#: filters.xml:7(para) =

+#. Tag: para
+#: filters.xml:31
+#, no-c-format
 msgid "Hibernate3 provides an innovative new approach to handling data wit=
h \"visibility\" rules. A <emphasis>Hibernate filter</emphasis> is a global=
, named, parameterized filter that may be enabled or disabled for a particu=
lar Hibernate session."
 msgstr ""
 =

-#: filters.xml:14(title) =

+#. Tag: title
+#: filters.xml:38
+#, no-c-format
 msgid "Hibernate filters"
 msgstr ""
 =

-#: filters.xml:16(para) =

+#. Tag: para
+#: filters.xml:40
+#, no-c-format
 msgid "Hibernate3 adds the ability to pre-define filter criteria and attac=
h those filters at both a class and a collection level. A filter criteria i=
s the ability to define a restriction clause very similiar to the existing =
\"where\" attribute available on the class and various collection elements.=
 Except these filter conditions can be parameterized. The application can t=
hen make the decision at runtime whether given filters should be enabled an=
d what their parameter values should be. Filters can be used like database =
views, but parameterized inside the application."
 msgstr ""
 =

-#: filters.xml:26(para) =

+#. Tag: para
+#: filters.xml:50
+#, no-c-format
 msgid "In order to use filters, they must first be defined and then attach=
ed to the appropriate mapping elements. To define a filter, use the <litera=
l>&lt;filter-def/&gt;</literal> element within a <literal>&lt;hibernate-map=
ping/&gt;</literal> element:"
 msgstr ""
 =

-#: filters.xml:36(para) =

+#. Tag: programlisting
+#: filters.xml:56
+#, no-c-format
+msgid ""
+      "<![CDATA[<filter-def name=3D\"myFilter\">\n"
+      "    <filter-param name=3D\"myFilterParam\" type=3D\"string\"/>\n"
+      "</filter-def>]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:58
+#, no-c-format
 msgid "Then, this filter can be attached to a class:"
 msgstr ""
 =

-#: filters.xml:45(para) =

+#. Tag: programlisting
+#: filters.xml:62
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"myClass\" ...>\n"
+      "    ...\n"
+      "    <filter name=3D\"myFilter\" condition=3D\":myFilterParam =3D MY=
_FILTERED_COLUMN\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:64
+#, no-c-format
 msgid "or, to a collection:"
 msgstr ""
 =

-#: filters.xml:53(para) =

+#. Tag: programlisting
+#: filters.xml:68
+#, no-c-format
+msgid ""
+      "<![CDATA[<set ...>\n"
+      "    <filter name=3D\"myFilter\" condition=3D\":myFilterParam =3D MY=
_FILTERED_COLUMN\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:70
+#, no-c-format
 msgid "or, even to both (or multiples of each) at the same time."
 msgstr ""
 =

-#: filters.xml:57(para) =

+#. Tag: para
+#: filters.xml:74
+#, no-c-format
 msgid "The methods on <literal>Session</literal> are: <literal>enableFilte=
r(String filterName)</literal>, <literal>getEnabledFilter(String filterName=
)</literal>, and <literal>disableFilter(String filterName)</literal>. By de=
fault, filters are <emphasis>not</emphasis> enabled for a given session; th=
ey must be explcitly enabled through use of the <literal>Session.enableFilt=
er()</literal> method, which returns an instance of the <literal>Filter</li=
teral> interface. Using the simple filter defined above, this would look li=
ke:"
 msgstr ""
 =

-#: filters.xml:68(para) =

+#. Tag: programlisting
+#: filters.xml:83
+#, no-c-format
+msgid "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilter=
Param\", \"some-value\");]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:85
+#, no-c-format
 msgid "Note that methods on the org.hibernate.Filter interface do allow th=
e method-chaining common to much of Hibernate."
 msgstr ""
 =

-#: filters.xml:72(para) =

+#. Tag: para
+#: filters.xml:89
+#, no-c-format
 msgid "A full example, using temporal data with an effective record date p=
attern:"
 msgstr ""
 =

-#: filters.xml:104(para) =

+#. Tag: programlisting
+#: filters.xml:93
+#, no-c-format
+msgid ""
+      "<![CDATA[<filter-def name=3D\"effectiveDate\">\n"
+      "    <filter-param name=3D\"asOfDate\" type=3D\"date\"/>\n"
+      "</filter-def>\n"
+      "\n"
+      "<class name=3D\"Employee\" ...>\n"
+      "...\n"
+      "    <many-to-one name=3D\"department\" column=3D\"dept_id\" class=
=3D\"Department\"/>\n"
+      "    <property name=3D\"effectiveStartDate\" type=3D\"date\" column=
=3D\"eff_start_dt\"/>\n"
+      "    <property name=3D\"effectiveEndDate\" type=3D\"date\" column=3D=
\"eff_end_dt\"/>\n"
+      "...\n"
+      "    <!--\n"
+      "        Note that this assumes non-terminal records have an eff_end=
_dt set to\n"
+      "        a max db date for simplicity-sake\n"
+      "    -->\n"
+      "    <filter name=3D\"effectiveDate\"\n"
+      "            condition=3D\":asOfDate BETWEEN eff_start_dt and eff_en=
d_dt\"/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"Department\" ...>\n"
+      "...\n"
+      "    <set name=3D\"employees\" lazy=3D\"true\">\n"
+      "        <key column=3D\"dept_id\"/>\n"
+      "        <one-to-many class=3D\"Employee\"/>\n"
+      "        <filter name=3D\"effectiveDate\"\n"
+      "                condition=3D\":asOfDate BETWEEN eff_start_dt and ef=
f_end_dt\"/>\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:95
+#, no-c-format
 msgid "Then, in order to ensure that you always get back currently effecti=
ve records, simply enable the filter on the session prior to retrieving emp=
loyee data:"
 msgstr ""
 =

-#: filters.xml:116(para) =

+#. Tag: programlisting
+#: filters.xml:100
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D ...;\n"
+      "session.enableFilter(\"effectiveDate\").setParameter(\"asOfDate\", =
new Date());\n"
+      "List results =3D session.createQuery(\"from Employee as e where e.s=
alary > :targetSalary\")\n"
+      "         .setLong(\"targetSalary\", new Long(1000000))\n"
+      "         .list();\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: filters.xml:102
+#, no-c-format
 msgid "In the HQL above, even though we only explicitly mentioned a salary=
 constraint on the results, because of the enabled filter the query will re=
turn only currently active employees who have a salary greater than a milli=
on dollars."
 msgstr ""
 =

-#: filters.xml:122(para) =

+#. Tag: para
+#: filters.xml:108
+#, no-c-format
 msgid "Note: if you plan on using filters with outer joining (either throu=
gh HQL or load fetching) be careful of the direction of the condition expre=
ssion. Its safest to set this up for left outer joining; in general, place =
the parameter first followed by the column name(s) after the operator."
 msgstr ""
 =

-#: filters.xml:129(para) =

+#. Tag: para
+#: filters.xml:115
+#, no-c-format
 msgid "After being defined a filter might be attached to multiple entities=
 and/or collections each with its own condition. That can be tedious when t=
he conditions are the same each time. Thus <literal>&lt;filter-def/&gt;</li=
teral> allows defining a default condition, either as an attribute or CDATA=
:"
 msgstr ""
 =

-#: filters.xml:139(para) =

-msgid "This default condition will then be used whenever the filter is att=
ached to something without specifying a condition. Note that this means you=
 can give a specific condition as part of the attachment of the filter whic=
h overrides the default condition in that particular case."
+#. Tag: programlisting
+#: filters.xml:122
+#, no-c-format
+msgid ""
+      "<![CDATA[<filter-def name=3D\"myFilter\" condition=3D\"abc > xyz\">=
...</filter-def>\n"
+      "<filter-def name=3D\"myOtherFilter\">abc=3Dxyz</filter-def>]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: filters.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: filters.xml:124
+#, no-c-format
+msgid "This default condition will then be used whenever the filter is att=
ached to something without specifying a condition. Note that this means you=
 can give a specific condition as part of the attachment of the filter whic=
h overrides the default condition in that particular case."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/inhe=
ritance_mapping.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/inheritanc=
e_mapping.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/inheritanc=
e_mapping.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,280 +1,631 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:32-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: inheritance_mapping.xml:5(title) =

+#. Tag: title
+#: inheritance_mapping.xml:29
+#, no-c-format
 msgid "Inheritance Mapping"
 msgstr ""
 =

-#: inheritance_mapping.xml:8(title) =

+#. Tag: title
+#: inheritance_mapping.xml:32
+#, no-c-format
 msgid "The Three Strategies"
 msgstr ""
 =

-#: inheritance_mapping.xml:10(para) =

+#. Tag: para
+#: inheritance_mapping.xml:34
+#, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr ""
 =

-#: inheritance_mapping.xml:16(para) =

+#. Tag: para
+#: inheritance_mapping.xml:40
+#, no-c-format
 msgid "table per class hierarchy"
 msgstr ""
 =

-#: inheritance_mapping.xml:21(para) inheritance_mapping.xml:456(entry) =

-msgid "table per subclass"
+#. Tag: para
+#: inheritance_mapping.xml:45
+#, no-c-format
+msgid "<para>table per subclass</para>"
 msgstr ""
 =

-#: inheritance_mapping.xml:26(para) =

+#. Tag: para
+#: inheritance_mapping.xml:50
+#, no-c-format
 msgid "table per concrete class"
 msgstr ""
 =

-#: inheritance_mapping.xml:32(para) =

+#. Tag: para
+#: inheritance_mapping.xml:56
+#, no-c-format
 msgid "In addition, Hibernate supports a fourth, slightly different kind o=
f polymorphism:"
 msgstr ""
 =

-#: inheritance_mapping.xml:39(para) =

+#. Tag: para
+#: inheritance_mapping.xml:63
+#, no-c-format
 msgid "implicit polymorphism"
 msgstr ""
 =

-#: inheritance_mapping.xml:45(para) =

+#. Tag: para
+#: inheritance_mapping.xml:69
+#, no-c-format
 msgid "It is possible to use different mapping strategies for different br=
anches of the same inheritance hierarchy, and then make use of implicit pol=
ymorphism to achieve polymorphism across the whole hierarchy. However, Hibe=
rnate does not support mixing <literal>&lt;subclass&gt;</literal>, and <lit=
eral>&lt;joined-subclass&gt;</literal> and <literal>&lt;union-subclass&gt;<=
/literal> mappings under the same root <literal>&lt;class&gt;</literal> ele=
ment. It is possible to mix together the table per hierarchy and table per =
subclass strategies, under the the same <literal>&lt;class&gt;</literal> el=
ement, by combining the <literal>&lt;subclass&gt;</literal> and <literal>&l=
t;join&gt;</literal> elements (see below)."
 msgstr ""
 =

-#: inheritance_mapping.xml:59(para) =

+#. Tag: para
+#: inheritance_mapping.xml:83
+#, no-c-format
 msgid "It is possible to define <literal>subclass</literal>, <literal>unio=
n-subclass</literal>, and <literal>joined-subclass</literal> mappings in se=
parate mapping documents, directly beneath <literal>hibernate-mapping</lite=
ral>. This allows you to extend a class hierachy just by adding a new mappi=
ng file. You must specify an <literal>extends</literal> attribute in the su=
bclass mapping, naming a previously mapped superclass. Note: Previously thi=
s feature made the ordering of the mapping documents important. Since Hiber=
nate3, the ordering of mapping files does not matter when using the extends=
 keyword. The ordering inside a single mapping file still needs to be defin=
ed as superclasses before subclasses."
 msgstr ""
 =

-#: inheritance_mapping.xml:79(title) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:94
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      " <hibernate-mapping>\n"
+      "     <subclass name=3D\"DomesticCat\" extends=3D\"Cat\" discriminat=
or-value=3D\"D\">\n"
+      "          <property name=3D\"name\" type=3D\"string\"/>\n"
+      "     </subclass>\n"
+      " </hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: title
+#: inheritance_mapping.xml:98
+#, no-c-format
 msgid "Table per class hierarchy"
 msgstr ""
 =

-#: inheritance_mapping.xml:81(para) =

+#. Tag: para
+#: inheritance_mapping.xml:100
+#, no-c-format
 msgid "Suppose we have an interface <literal>Payment</literal>, with imple=
mentors <literal>CreditCardPayment</literal>, <literal>CashPayment</literal=
>, <literal>ChequePayment</literal>. The table per hierarchy mapping would =
look like:"
 msgstr ""
 =

-#: inheritance_mapping.xml:107(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:107
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Payment\" table=3D\"PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"PAYMENT_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <discriminator column=3D\"PAYMENT_TYPE\" type=3D\"string\"/>\n"
+      "    <property name=3D\"amount\" column=3D\"AMOUNT\"/>\n"
+      "    ...\n"
+      "    <subclass name=3D\"CreditCardPayment\" discriminator-value=3D\"=
CREDIT\">\n"
+      "        <property name=3D\"creditCardType\" column=3D\"CCTYPE\"/>\n"
+      "        ...\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"CashPayment\" discriminator-value=3D\"CASH\"=
>\n"
+      "        ...\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"ChequePayment\" discriminator-value=3D\"CHEQ=
UE\">\n"
+      "        ...\n"
+      "    </subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:109
+#, no-c-format
 msgid "Exactly one table is required. There is one big limitation of this =
mapping strategy: columns declared by the subclasses, such as <literal>CCTY=
PE</literal>, may not have <literal>NOT NULL</literal> constraints."
 msgstr ""
 =

-#: inheritance_mapping.xml:116(title) =

+#. Tag: title
+#: inheritance_mapping.xml:118
+#, no-c-format
 msgid "Table per subclass"
 msgstr ""
 =

-#: inheritance_mapping.xml:118(para) =

+#. Tag: para
+#: inheritance_mapping.xml:120
+#, no-c-format
 msgid "A table per subclass mapping would look like:"
 msgstr ""
 =

-#: inheritance_mapping.xml:143(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:124
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Payment\" table=3D\"PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"PAYMENT_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"amount\" column=3D\"AMOUNT\"/>\n"
+      "    ...\n"
+      "    <joined-subclass name=3D\"CreditCardPayment\" table=3D\"CREDIT_=
PAYMENT\">\n"
+      "        <key column=3D\"PAYMENT_ID\"/>\n"
+      "        <property name=3D\"creditCardType\" column=3D\"CCTYPE\"/>\n"
+      "        ...\n"
+      "    </joined-subclass>\n"
+      "    <joined-subclass name=3D\"CashPayment\" table=3D\"CASH_PAYMENT\=
">\n"
+      "        <key column=3D\"PAYMENT_ID\"/>\n"
+      "        ...\n"
+      "    </joined-subclass>\n"
+      "    <joined-subclass name=3D\"ChequePayment\" table=3D\"CHEQUE_PAYM=
ENT\">\n"
+      "        <key column=3D\"PAYMENT_ID\"/>\n"
+      "        ...\n"
+      "    </joined-subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:126
+#, no-c-format
 msgid "Four tables are required. The three subclass tables have primary ke=
y associations to the superclass table (so the relational model is actually=
 a one-to-one association)."
 msgstr ""
 =

-#: inheritance_mapping.xml:152(title) =

+#. Tag: title
+#: inheritance_mapping.xml:135
+#, no-c-format
 msgid "Table per subclass, using a discriminator"
 msgstr ""
 =

-#: inheritance_mapping.xml:154(para) =

+#. Tag: para
+#: inheritance_mapping.xml:137
+#, no-c-format
 msgid "Note that Hibernate's implementation of table per subclass requires=
 no discriminator column. Other object/relational mappers use a different i=
mplementation of table per subclass which requires a type discriminator col=
umn in the superclass table. The approach taken by Hibernate is much more d=
ifficult to implement but arguably more correct from a relational point of =
view. If you would like to use a discriminator column with the table per su=
bclass strategy, you may combine the use of <literal>&lt;subclass&gt;</lite=
ral> and <literal>&lt;join&gt;</literal>, as follow:"
 msgstr ""
 =

-#: inheritance_mapping.xml:194(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:149
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Payment\" table=3D\"PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"PAYMENT_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <discriminator column=3D\"PAYMENT_TYPE\" type=3D\"string\"/>\n"
+      "    <property name=3D\"amount\" column=3D\"AMOUNT\"/>\n"
+      "    ...\n"
+      "    <subclass name=3D\"CreditCardPayment\" discriminator-value=3D\"=
CREDIT\">\n"
+      "        <join table=3D\"CREDIT_PAYMENT\">\n"
+      "            <key column=3D\"PAYMENT_ID\"/>\n"
+      "            <property name=3D\"creditCardType\" column=3D\"CCTYPE\"=
/>\n"
+      "            ...\n"
+      "        </join>\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"CashPayment\" discriminator-value=3D\"CASH\"=
>\n"
+      "        <join table=3D\"CASH_PAYMENT\">\n"
+      "            <key column=3D\"PAYMENT_ID\"/>\n"
+      "            ...\n"
+      "        </join>\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"ChequePayment\" discriminator-value=3D\"CHEQ=
UE\">\n"
+      "        <join table=3D\"CHEQUE_PAYMENT\" fetch=3D\"select\">\n"
+      "            <key column=3D\"PAYMENT_ID\"/>\n"
+      "            ...\n"
+      "        </join>\n"
+      "    </subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:151
+#, no-c-format
 msgid "The optional <literal>fetch=3D\"select\"</literal> declaration tell=
s Hibernate not to fetch the <literal>ChequePayment</literal> subclass data=
 using an outer join when querying the superclass."
 msgstr ""
 =

-#: inheritance_mapping.xml:203(title) =

+#. Tag: title
+#: inheritance_mapping.xml:160
+#, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr ""
 =

-#: inheritance_mapping.xml:205(para) =

+#. Tag: para
+#: inheritance_mapping.xml:162
+#, no-c-format
 msgid "You may even mix the table per hierarchy and table per subclass str=
ategies using this approach:"
 msgstr ""
 =

-#: inheritance_mapping.xml:231(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:167
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Payment\" table=3D\"PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"PAYMENT_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <discriminator column=3D\"PAYMENT_TYPE\" type=3D\"string\"/>\n"
+      "    <property name=3D\"amount\" column=3D\"AMOUNT\"/>\n"
+      "    ...\n"
+      "    <subclass name=3D\"CreditCardPayment\" discriminator-value=3D\"=
CREDIT\">\n"
+      "        <join table=3D\"CREDIT_PAYMENT\">\n"
+      "            <property name=3D\"creditCardType\" column=3D\"CCTYPE\"=
/>\n"
+      "            ...\n"
+      "        </join>\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"CashPayment\" discriminator-value=3D\"CASH\"=
>\n"
+      "        ...\n"
+      "    </subclass>\n"
+      "    <subclass name=3D\"ChequePayment\" discriminator-value=3D\"CHEQ=
UE\">\n"
+      "        ...\n"
+      "    </subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:169
+#, no-c-format
 msgid "For any of these mapping strategies, a polymorphic association to t=
he root <literal>Payment</literal> class is mapped using <literal>&lt;many-=
to-one&gt;</literal>."
 msgstr ""
 =

-#: inheritance_mapping.xml:242(title) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:175
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"payment\" column=3D\"PAYMENT_ID\" cl=
ass=3D\"Payment\"/>]]>"
+msgstr ""
+
+#. Tag: title
+#: inheritance_mapping.xml:180
+#, no-c-format
 msgid "Table per concrete class"
 msgstr ""
 =

-#: inheritance_mapping.xml:244(para) =

+#. Tag: para
+#: inheritance_mapping.xml:182
+#, no-c-format
 msgid "There are two ways we could go about mapping the table per concrete=
 class strategy. The first is to use <literal>&lt;union-subclass&gt;</liter=
al>."
 msgstr ""
 =

-#: inheritance_mapping.xml:267(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:187
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Payment\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"PAYMENT_ID\">\n"
+      "        <generator class=3D\"sequence\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"amount\" column=3D\"AMOUNT\"/>\n"
+      "    ...\n"
+      "    <union-subclass name=3D\"CreditCardPayment\" table=3D\"CREDIT_P=
AYMENT\">\n"
+      "        <property name=3D\"creditCardType\" column=3D\"CCTYPE\"/>\n"
+      "        ...\n"
+      "    </union-subclass>\n"
+      "    <union-subclass name=3D\"CashPayment\" table=3D\"CASH_PAYMENT\"=
>\n"
+      "        ...\n"
+      "    </union-subclass>\n"
+      "    <union-subclass name=3D\"ChequePayment\" table=3D\"CHEQUE_PAYME=
NT\">\n"
+      "        ...\n"
+      "    </union-subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:189
+#, no-c-format
 msgid "Three tables are involved for the subclasses. Each table defines co=
lumns for all properties of the class, including inherited properties."
 msgstr ""
 =

-#: inheritance_mapping.xml:272(para) =

+#. Tag: para
+#: inheritance_mapping.xml:194
+#, no-c-format
 msgid "The limitation of this approach is that if a property is mapped on =
the superclass, the column name must be the same on all subclass tables. (W=
e might relax this in a future release of Hibernate.) The identity generato=
r strategy is not allowed in union subclass inheritance, indeed the primary=
 key seed has to be shared accross all unioned subclasses of a hierarchy."
 msgstr ""
 =

-#: inheritance_mapping.xml:281(para) =

+#. Tag: para
+#: inheritance_mapping.xml:203
+#, no-c-format
 msgid "If your superclass is abstract, map it with <literal>abstract=3D\"t=
rue\"</literal>. Of course, if it is not abstract, an additional table (def=
aults to <literal>PAYMENT</literal> in the example above) is needed to hold=
 instances of the superclass."
 msgstr ""
 =

-#: inheritance_mapping.xml:291(title) =

+#. Tag: title
+#: inheritance_mapping.xml:213
+#, no-c-format
 msgid "Table per concrete class, using implicit polymorphism"
 msgstr ""
 =

-#: inheritance_mapping.xml:293(para) =

+#. Tag: para
+#: inheritance_mapping.xml:215
+#, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr ""
 =

-#: inheritance_mapping.xml:321(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:219
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"CreditCardPayment\" table=3D\"CREDIT_PAYME=
NT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"CREDIT_PAYMENT_ID\=
">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"amount\" column=3D\"CREDIT_AMOUNT\"/>\n"
+      "    ...\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"CashPayment\" table=3D\"CASH_PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"CASH_PAYMENT_ID\">=
\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"amount\" column=3D\"CASH_AMOUNT\"/>\n"
+      "    ...\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"ChequePayment\" table=3D\"CHEQUE_PAYMENT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"CHEQUE_PAYMENT_ID\=
">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"amount\" column=3D\"CHEQUE_AMOUNT\"/>\n"
+      "    ...\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:221
+#, no-c-format
 msgid "Notice that nowhere do we mention the <literal>Payment</literal> in=
terface explicitly. Also notice that properties of <literal>Payment</litera=
l> are mapped in each of the subclasses. If you want to avoid duplication, =
consider using XML entities (e.g. <literal>[ &lt;!ENTITY allproperties SYST=
EM \"allproperties.xml\"&gt; ]</literal> in the <literal>DOCTYPE</literal> =
declartion and <literal>&amp;allproperties;</literal> in the mapping)."
 msgstr ""
 =

-#: inheritance_mapping.xml:331(para) =

+#. Tag: para
+#: inheritance_mapping.xml:231
+#, no-c-format
 msgid "The disadvantage of this approach is that Hibernate does not genera=
te SQL <literal>UNION</literal>s when performing polymorphic queries."
 msgstr ""
 =

-#: inheritance_mapping.xml:336(para) =

+#. Tag: para
+#: inheritance_mapping.xml:236
+#, no-c-format
 msgid "For this mapping strategy, a polymorphic association to <literal>Pa=
yment</literal> is usually mapped using <literal>&lt;any&gt;</literal>."
 msgstr ""
 =

-#: inheritance_mapping.xml:352(title) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:241
+#, no-c-format
+msgid ""
+      "<![CDATA[<any name=3D\"payment\" meta-type=3D\"string\" id-type=3D\=
"long\">\n"
+      "    <meta-value value=3D\"CREDIT\" class=3D\"CreditCardPayment\"/>\=
n"
+      "    <meta-value value=3D\"CASH\" class=3D\"CashPayment\"/>\n"
+      "    <meta-value value=3D\"CHEQUE\" class=3D\"ChequePayment\"/>\n"
+      "    <column name=3D\"PAYMENT_CLASS\"/>\n"
+      "    <column name=3D\"PAYMENT_ID\"/>\n"
+      "</any>]]>"
+msgstr ""
+
+#. Tag: title
+#: inheritance_mapping.xml:246
+#, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr ""
 =

-#: inheritance_mapping.xml:354(para) =

+#. Tag: para
+#: inheritance_mapping.xml:248
+#, no-c-format
 msgid "There is one further thing to notice about this mapping. Since the =
subclasses are each mapped in their own <literal>&lt;class&gt;</literal> el=
ement (and since <literal>Payment</literal> is just an interface), each of =
the subclasses could easily be part of another inheritance hierarchy! (And =
you can still use polymorphic queries against the <literal>Payment</literal=
> interface.)"
 msgstr ""
 =

-#: inheritance_mapping.xml:390(para) =

+#. Tag: programlisting
+#: inheritance_mapping.xml:256
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"CreditCardPayment\" table=3D\"CREDIT_PAYME=
NT\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"CREDIT_PAYMENT_ID\=
">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <discriminator column=3D\"CREDIT_CARD\" type=3D\"string\"/>\n"
+      "    <property name=3D\"amount\" column=3D\"CREDIT_AMOUNT\"/>\n"
+      "    ...\n"
+      "    <subclass name=3D\"MasterCardPayment\" discriminator-value=3D\"=
MDC\"/>\n"
+      "    <subclass name=3D\"VisaPayment\" discriminator-value=3D\"VISA\"=
/>\n"
+      "</class>\n"
+      "\n"
+      "<class name=3D\"NonelectronicTransaction\" table=3D\"NONELECTRONIC_=
TXN\">\n"
+      "    <id name=3D\"id\" type=3D\"long\" column=3D\"TXN_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    ...\n"
+      "    <joined-subclass name=3D\"CashPayment\" table=3D\"CASH_PAYMENT\=
">\n"
+      "        <key column=3D\"PAYMENT_ID\"/>\n"
+      "        <property name=3D\"amount\" column=3D\"CASH_AMOUNT\"/>\n"
+      "        ...\n"
+      "    </joined-subclass>\n"
+      "    <joined-subclass name=3D\"ChequePayment\" table=3D\"CHEQUE_PAYM=
ENT\">\n"
+      "        <key column=3D\"PAYMENT_ID\"/>\n"
+      "        <property name=3D\"amount\" column=3D\"CHEQUE_AMOUNT\"/>\n"
+      "        ...\n"
+      "    </joined-subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: inheritance_mapping.xml:258
+#, no-c-format
 msgid "Once again, we don't mention <literal>Payment</literal> explicitly.=
 If we execute a query against the <literal>Payment</literal> interface - f=
or example, <literal>from Payment</literal> - Hibernate automatically retur=
ns instances of <literal>CreditCardPayment</literal> (and its subclasses, s=
ince they also implement <literal>Payment</literal>), <literal>CashPayment<=
/literal> and <literal>ChequePayment</literal> but not instances of <litera=
l>NonelectronicTransaction</literal>."
 msgstr ""
 =

-#: inheritance_mapping.xml:405(title) =

+#. Tag: title
+#: inheritance_mapping.xml:273
+#, no-c-format
 msgid "Limitations"
 msgstr ""
 =

-#: inheritance_mapping.xml:407(para) =

+#. Tag: para
+#: inheritance_mapping.xml:275
+#, no-c-format
 msgid "There are certain limitations to the \"implicit polymorphism\" appr=
oach to the table per concrete-class mapping strategy. There are somewhat l=
ess restrictive limitations to <literal>&lt;union-subclass&gt;</literal> ma=
ppings."
 msgstr ""
 =

-#: inheritance_mapping.xml:414(para) =

+#. Tag: para
+#: inheritance_mapping.xml:282
+#, no-c-format
 msgid "The following table shows the limitations of table per concrete-cla=
ss mappings, and of implicit polymorphism, in Hibernate."
 msgstr ""
 =

-#: inheritance_mapping.xml:420(title) =

+#. Tag: title
+#: inheritance_mapping.xml:288
+#, no-c-format
 msgid "Features of inheritance mappings"
 msgstr ""
 =

-#: inheritance_mapping.xml:432(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:300
+#, no-c-format
 msgid "Inheritance strategy"
 msgstr ""
 =

-#: inheritance_mapping.xml:433(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:301
+#, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr ""
 =

-#: inheritance_mapping.xml:434(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:302
+#, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr ""
 =

-#: inheritance_mapping.xml:435(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:303
+#, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr ""
 =

-#: inheritance_mapping.xml:436(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:304
+#, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr ""
 =

-#: inheritance_mapping.xml:437(literal) =

-msgid "load()/get()"
+#. Tag: entry
+#: inheritance_mapping.xml:305
+#, no-c-format
+msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 =

-#: inheritance_mapping.xml:437(entry) =

-msgid "Polymorphic <placeholder-1/>"
-msgstr ""
-
-#: inheritance_mapping.xml:438(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:306
+#, no-c-format
 msgid "Polymorphic queries"
 msgstr ""
 =

-#: inheritance_mapping.xml:439(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:307
+#, no-c-format
 msgid "Polymorphic joins"
 msgstr ""
 =

-#: inheritance_mapping.xml:440(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:308
+#, no-c-format
 msgid "Outer join fetching"
 msgstr ""
 =

-#: inheritance_mapping.xml:445(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:313
+#, no-c-format
 msgid "table per class-hierarchy"
 msgstr ""
 =

-#: inheritance_mapping.xml:446(literal) inheritance_mapping.xml:457(litera=
l) inheritance_mapping.xml:468(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:314 inheritance_mapping.xml:325 inheritance_map=
ping.xml:336
+#, no-c-format
 msgid "&lt;many-to-one&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:447(literal) inheritance_mapping.xml:458(litera=
l) inheritance_mapping.xml:469(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:315 inheritance_mapping.xml:326 inheritance_map=
ping.xml:337
+#, no-c-format
 msgid "&lt;one-to-one&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:448(literal) inheritance_mapping.xml:459(litera=
l) inheritance_mapping.xml:470(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:316 inheritance_mapping.xml:327
+#, no-c-format
 msgid "&lt;one-to-many&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:449(literal) inheritance_mapping.xml:460(litera=
l) inheritance_mapping.xml:471(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:317 inheritance_mapping.xml:328 inheritance_map=
ping.xml:339
+#, no-c-format
 msgid "&lt;many-to-many&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:450(literal) inheritance_mapping.xml:461(litera=
l) inheritance_mapping.xml:472(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:318 inheritance_mapping.xml:329 inheritance_map=
ping.xml:340
+#, no-c-format
 msgid "s.get(Payment.class, id)"
 msgstr ""
 =

-#: inheritance_mapping.xml:451(literal) inheritance_mapping.xml:462(litera=
l) inheritance_mapping.xml:473(literal) inheritance_mapping.xml:484(literal=
) =

+#. Tag: literal
+#: inheritance_mapping.xml:319 inheritance_mapping.xml:330 inheritance_map=
ping.xml:341 inheritance_mapping.xml:352
+#, no-c-format
 msgid "from Payment p"
 msgstr ""
 =

-#: inheritance_mapping.xml:452(literal) inheritance_mapping.xml:463(litera=
l) inheritance_mapping.xml:474(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:320 inheritance_mapping.xml:331 inheritance_map=
ping.xml:342
+#, no-c-format
 msgid "from Order o join o.payment p"
 msgstr ""
 =

-#: inheritance_mapping.xml:453(emphasis) inheritance_mapping.xml:464(empha=
sis) inheritance_mapping.xml:475(emphasis) =

+#. Tag: emphasis
+#: inheritance_mapping.xml:321 inheritance_mapping.xml:332 inheritance_map=
ping.xml:343
+#, no-c-format
 msgid "supported"
 msgstr ""
 =

-#: inheritance_mapping.xml:467(entry) =

-msgid "table per concrete-class (union-subclass)"
+#. Tag: entry
+#: inheritance_mapping.xml:324
+#, no-c-format
+msgid "<entry>table per subclass</entry>"
 msgstr ""
 =

-#: inheritance_mapping.xml:470(literal) =

-msgid "inverse=3D\"true\""
+#. Tag: entry
+#: inheritance_mapping.xml:335
+#, no-c-format
+msgid "table per concrete-class (union-subclass)"
 msgstr ""
 =

-#: inheritance_mapping.xml:470(entry) =

-msgid "<placeholder-1/> (for <placeholder-2/> only)"
+#. Tag: entry
+#: inheritance_mapping.xml:338
+#, no-c-format
+msgid "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=3D\"tr=
ue\"</literal> only)"
 msgstr ""
 =

-#: inheritance_mapping.xml:478(entry) =

+#. Tag: entry
+#: inheritance_mapping.xml:346
+#, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr ""
 =

-#: inheritance_mapping.xml:479(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:347
+#, no-c-format
 msgid "&lt;any&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:480(emphasis) inheritance_mapping.xml:481(empha=
sis) inheritance_mapping.xml:485(emphasis) inheritance_mapping.xml:486(emph=
asis) =

+#. Tag: emphasis
+#: inheritance_mapping.xml:348 inheritance_mapping.xml:349 inheritance_map=
ping.xml:353 inheritance_mapping.xml:354
+#, no-c-format
 msgid "not supported"
 msgstr ""
 =

-#: inheritance_mapping.xml:482(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:350
+#, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr ""
 =

-#: inheritance_mapping.xml:483(literal) =

+#. Tag: literal
+#: inheritance_mapping.xml:351
+#, no-c-format
 msgid "s.createCriteria(Payment.class).add( Restrictions.idEq(id) ).unique=
Result()"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: inheritance_mapping.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/perf=
ormance.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/performanc=
e.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/performanc=
e.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,808 +1,1556 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:32-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: performance.xml:5(title) =

+#. Tag: title
+#: performance.xml:29
+#, no-c-format
 msgid "Improving performance"
 msgstr ""
 =

-#: performance.xml:8(title) =

+#. Tag: title
+#: performance.xml:32
+#, no-c-format
 msgid "Fetching strategies"
 msgstr ""
 =

-#: performance.xml:10(para) =

+#. Tag: para
+#: performance.xml:34
+#, no-c-format
 msgid "A <emphasis>fetching strategy</emphasis> is the strategy Hibernate =
will use for retrieving associated objects if the application needs to navi=
gate the association. Fetch strategies may be declared in the O/R mapping m=
etadata, or over-ridden by a particular HQL or <literal>Criteria</literal> =
query."
 msgstr ""
 =

-#: performance.xml:17(para) =

+#. Tag: para
+#: performance.xml:41
+#, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr ""
 =

-#: performance.xml:23(para) =

+#. Tag: para
+#: performance.xml:47
+#, no-c-format
 msgid "<emphasis>Join fetching</emphasis> - Hibernate retrieves the associ=
ated instance or collection in the same <literal>SELECT</literal>, using an=
 <literal>OUTER JOIN</literal>."
 msgstr ""
 =

-#: performance.xml:30(para) =

+#. Tag: para
+#: performance.xml:54
+#, no-c-format
 msgid "<emphasis>Select fetching</emphasis> - a second <literal>SELECT</li=
teral> is used to retrieve the associated entity or collection. Unless you =
explicitly disable lazy fetching by specifying <literal>lazy=3D\"false\"</l=
iteral>, this second select will only be executed when you actually access =
the association."
 msgstr ""
 =

-#: performance.xml:39(para) =

+#. Tag: para
+#: performance.xml:63
+#, no-c-format
 msgid "<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT<=
/literal> is used to retrieve the associated collections for all entities r=
etrieved in a previous query or fetch. Unless you explicitly disable lazy f=
etching by specifying <literal>lazy=3D\"false\"</literal>, this second sele=
ct will only be executed when you actually access the association."
 msgstr ""
 =

-#: performance.xml:48(para) =

+#. Tag: para
+#: performance.xml:72
+#, no-c-format
 msgid "<emphasis>Batch fetching</emphasis> - an optimization strategy for =
select fetching - Hibernate retrieves a batch of entity instances or collec=
tions in a single <literal>SELECT</literal>, by specifying a list of primar=
y keys or foreign keys."
 msgstr ""
 =

-#: performance.xml:57(para) =

+#. Tag: para
+#: performance.xml:81
+#, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr ""
 =

-#: performance.xml:63(para) =

+#. Tag: para
+#: performance.xml:87
+#, no-c-format
 msgid "<emphasis>Immediate fetching</emphasis> - an association, collectio=
n or attribute is fetched immediately, when the owner is loaded."
 msgstr ""
 =

-#: performance.xml:69(para) =

+#. Tag: para
+#: performance.xml:93
+#, no-c-format
 msgid "<emphasis>Lazy collection fetching</emphasis> - a collection is fet=
ched when the application invokes an operation upon that collection. (This =
is the default for collections.)"
 msgstr ""
 =

-#: performance.xml:76(para) =

+#. Tag: para
+#: performance.xml:100
+#, no-c-format
 msgid "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individua=
l elements of the collection are accessed from the database as needed. Hibe=
rnate tries not to fetch the whole collection into memory unless absolutely=
 needed (suitable for very large collections)"
 msgstr ""
 =

-#: performance.xml:84(para) =

+#. Tag: para
+#: performance.xml:108
+#, no-c-format
 msgid "<emphasis>Proxy fetching</emphasis> - a single-valued association i=
s fetched when a method other than the identifier getter is invoked upon th=
e associated object."
 msgstr ""
 =

-#: performance.xml:91(para) =

+#. Tag: para
+#: performance.xml:115
+#, no-c-format
 msgid "<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued associ=
ation 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) but more transparent, since no proxy is vi=
sible to the application. This approach requires buildtime bytecode instrum=
entation and is rarely necessary."
 msgstr ""
 =

-#: performance.xml:101(para) =

+#. Tag: para
+#: performance.xml:125
+#, no-c-format
 msgid "<emphasis>Lazy attribute fetching</emphasis> - an attribute or sing=
le valued association is fetched when the instance variable is accessed. Th=
is approach requires buildtime bytecode instrumentation and is rarely neces=
sary."
 msgstr ""
 =

-#: performance.xml:110(para) =

+#. Tag: para
+#: performance.xml:134
+#, no-c-format
 msgid "We have two orthogonal notions here: <emphasis>when</emphasis> is t=
he association fetched, and <emphasis>how</emphasis> is it fetched (what SQ=
L is used). Don't confuse them! We use <literal>fetch</literal> to tune per=
formance. We may use <literal>lazy</literal> to define a contract for what =
data is always available in any detached instance of a particular class."
 msgstr ""
 =

-#: performance.xml:119(title) =

+#. Tag: title
+#: performance.xml:143
+#, no-c-format
 msgid "Working with lazy associations"
 msgstr ""
 =

-#: performance.xml:121(para) =

+#. Tag: para
+#: performance.xml:145
+#, no-c-format
 msgid "By default, Hibernate3 uses lazy select fetching for collections an=
d lazy proxy fetching for single-valued associations. These defaults make s=
ense for almost all associations in almost all applications."
 msgstr ""
 =

-#: performance.xml:127(para) =

+#. Tag: para
+#: performance.xml:151
+#, no-c-format
 msgid "<emphasis>Note:</emphasis> if you set <literal>hibernate.default_ba=
tch_fetch_size</literal>, Hibernate will use the batch fetch optimization f=
or lazy fetching (this optimization may also be enabled at a more granular =
level)."
 msgstr ""
 =

-#: performance.xml:134(para) =

+#. Tag: para
+#: performance.xml:158
+#, no-c-format
 msgid "However, lazy fetching poses one problem that you must be aware of.=
 Access to a lazy association outside of the context of an open Hibernate s=
ession will result in an exception. For example:"
 msgstr ""
 =

-#: performance.xml:152(para) =

+#. Tag: programlisting
+#: performance.xml:164
+#, no-c-format
+msgid ""
+      "<![CDATA[s =3D sessions.openSession();\n"
+      "Transaction tx =3D s.beginTransaction();\n"
+      "            \n"
+      "User u =3D (User) s.createQuery(\"from User u where u.name=3D:userN=
ame\")\n"
+      "    .setString(\"userName\", userName).uniqueResult();\n"
+      "Map permissions =3D u.getPermissions();\n"
+      "\n"
+      "tx.commit();\n"
+      "s.close();\n"
+      "\n"
+      "Integer accessLevel =3D (Integer) permissions.get(\"accounts\");  /=
/ Error!]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:166
+#, no-c-format
 msgid "Since the permissions collection was not initialized when the <lite=
ral>Session</literal> was closed, the collection will not be able to load i=
ts state. <emphasis>Hibernate does not support lazy initialization for deta=
ched objects</emphasis>. The fix is to move the code that reads from the co=
llection to just before the transaction is committed."
 msgstr ""
 =

-#: performance.xml:160(para) =

+#. Tag: para
+#: performance.xml:174
+#, no-c-format
 msgid "Alternatively, we could use a non-lazy collection or association, b=
y specifying <literal>lazy=3D\"false\"</literal> for the association mappin=
g. 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 end up needing to fetch the entire dat=
abase into memory in every transaction!"
 msgstr ""
 =

-#: performance.xml:169(para) =

+#. Tag: para
+#: performance.xml:183
+#, no-c-format
 msgid "On the other hand, we often want to choose join fetching (which is =
non-lazy by nature) instead of select fetching in a particular transaction.=
 We'll now see how to customize the fetching strategy. In Hibernate3, the m=
echanisms for choosing a fetch strategy are identical for single-valued ass=
ociations and collections."
 msgstr ""
 =

-#: performance.xml:180(title) =

+#. Tag: title
+#: performance.xml:194
+#, no-c-format
 msgid "Tuning fetch strategies"
 msgstr ""
 =

-#: performance.xml:182(para) =

+#. Tag: para
+#: performance.xml:196
+#, no-c-format
 msgid "Select fetching (the default) is extremely vulnerable to N+1 select=
s problems, so we might want to enable join fetching in the mapping documen=
t:"
 msgstr ""
 =

-#: performance.xml:195(para) =

+#. Tag: programlisting
+#: performance.xml:201
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"permissions\" \n"
+      "            fetch=3D\"join\">\n"
+      "    <key column=3D\"userId\"/>\n"
+      "    <one-to-many class=3D\"Permission\"/>\n"
+      "</set]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: performance.xml:203
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"mother\" class=3D\"Cat\" fetch=3D\"j=
oin\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:205
+#, no-c-format
 msgid "The <literal>fetch</literal> strategy defined in the mapping docume=
nt affects:"
 msgstr ""
 =

-#: performance.xml:201(para) =

+#. Tag: para
+#: performance.xml:211
+#, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr ""
 =

-#: performance.xml:206(para) =

+#. Tag: para
+#: performance.xml:216
+#, no-c-format
 msgid "retrieval that happens implicitly when an association is navigated"
 msgstr ""
 =

-#: performance.xml:211(para) =

+#. Tag: para
+#: performance.xml:221
+#, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr ""
 =

-#: performance.xml:216(para) =

+#. Tag: para
+#: performance.xml:226
+#, no-c-format
 msgid "HQL queries if <literal>subselect</literal> fetching is used"
 msgstr ""
 =

-#: performance.xml:222(para) =

+#. Tag: para
+#: performance.xml:232
+#, no-c-format
 msgid "No matter what fetching strategy you use, the defined non-lazy grap=
h is guaranteed to be loaded into memory. Note that this might result in se=
veral immediate selects being used to execute a particular HQL query."
 msgstr ""
 =

-#: performance.xml:228(para) =

+#. Tag: para
+#: performance.xml:238
+#, no-c-format
 msgid "Usually, we don't use the mapping document to customize fetching. I=
nstead, we keep the default behavior, and override it for a particular tran=
saction, using <literal>left join fetch</literal> in HQL. This tells Hibern=
ate to fetch the association eagerly in the first select, using an outer jo=
in. In the <literal>Criteria</literal> query API, you would use <literal>se=
tFetchMode(FetchMode.JOIN)</literal>."
 msgstr ""
 =

-#: performance.xml:237(para) =

+#. Tag: para
+#: performance.xml:247
+#, no-c-format
 msgid "If you ever feel like you wish you could change the fetching strate=
gy used by <literal>get()</literal> or <literal>load()</literal>, simply us=
e a <literal>Criteria</literal> query, for example:"
 msgstr ""
 =

-#: performance.xml:248(para) =

+#. Tag: programlisting
+#: performance.xml:253
+#, no-c-format
+msgid ""
+      "<![CDATA[User user =3D (User) session.createCriteria(User.class)\n"
+      "                .setFetchMode(\"permissions\", FetchMode.JOIN)\n"
+      "                .add( Restrictions.idEq(userId) )\n"
+      "                .uniqueResult();]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:255
+#, no-c-format
 msgid "(This is Hibernate's equivalent of what some ORM solutions call a \=
"fetch plan\".)"
 msgstr ""
 =

-#: performance.xml:252(para) =

+#. Tag: para
+#: performance.xml:259
+#, no-c-format
 msgid "A completely different way to avoid problems with N+1 selects is to=
 use the second-level cache."
 msgstr ""
 =

-#: performance.xml:260(title) =

+#. Tag: title
+#: performance.xml:267
+#, no-c-format
 msgid "Single-ended association proxies"
 msgstr ""
 =

-#: performance.xml:262(para) =

+#. Tag: para
+#: performance.xml:269
+#, 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 o=
f the association must be proxied. Hibernate implements lazy initializing p=
roxies for persistent objects using runtime bytecode enhancement (via the e=
xcellent CGLIB library)."
 msgstr ""
 =

-#: performance.xml:270(para) =

+#. Tag: para
+#: performance.xml:277
+#, no-c-format
 msgid "By default, Hibernate3 generates proxies (at startup) for all persi=
stent classes and uses them to enable lazy fetching of <literal>many-to-one=
</literal> and <literal>one-to-one</literal> associations."
 msgstr ""
 =

-#: performance.xml:276(para) =

+#. Tag: para
+#: performance.xml:283
+#, no-c-format
 msgid "The mapping file may declare an interface to use as the proxy inter=
face for that class, with the <literal>proxy</literal> attribute. By defaul=
t, Hibernate uses a subclass of the class. <emphasis>Note that the proxied =
class must implement a default constructor with at least package visibility=
. We recommend this constructor for all persistent classes!</emphasis>"
 msgstr ""
 =

-#: performance.xml:283(para) =

+#. Tag: para
+#: performance.xml:290
+#, no-c-format
 msgid "There are some gotchas to be aware of when extending this approach =
to polymorphic classes, eg."
 msgstr ""
 =

-#: performance.xml:295(para) =

+#. Tag: programlisting
+#: performance.xml:295
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Cat\" proxy=3D\"Cat\">\n"
+      "    ......\n"
+      "    <subclass name=3D\"DomesticCat\">\n"
+      "        .....\n"
+      "    </subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:297
+#, 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 i=
nstance of <literal>DomesticCat</literal>:"
 msgstr ""
 =

-#: performance.xml:307(para) =

+#. Tag: programlisting
+#: performance.xml:303
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D (Cat) session.load(Cat.class, id);  // instant=
iate a proxy (does not hit the db)\n"
+      "if ( cat.isDomesticCat() ) {                  // hit the db to init=
ialize the proxy\n"
+      "    DomesticCat dc =3D (DomesticCat) cat;       // Error!\n"
+      "    ....\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:305
+#, no-c-format
 msgid "Secondly, it is possible to break proxy <literal>=3D=3D</literal>."
 msgstr ""
 =

-#: performance.xml:316(para) =

+#. Tag: programlisting
+#: performance.xml:309
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D (Cat) session.load(Cat.class, id);            =
// instantiate a Cat proxy\n"
+      "DomesticCat dc =3D \n"
+      "        (DomesticCat) session.load(DomesticCat.class, id);  // acqu=
ire new DomesticCat proxy!\n"
+      "System.out.println(cat=3D=3Ddc);                            // fals=
e]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:311
+#, 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 inst=
ance will still be the same object:"
 msgstr ""
 =

-#: performance.xml:324(para) =

+#. Tag: programlisting
+#: performance.xml:316
+#, no-c-format
+msgid ""
+      "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the prox=
y\n"
+      "System.out.println( dc.getWeight() );  // 11.0]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:318
+#, no-c-format
 msgid "Third, you may not use a CGLIB proxy for a <literal>final</literal>=
 class or a class with any <literal>final</literal> methods."
 msgstr ""
 =

-#: performance.xml:329(para) =

+#. Tag: para
+#: performance.xml:323
+#, no-c-format
 msgid "Finally, if your persistent object acquires any resources upon inst=
antiation (eg. in initializers or default constructor), then those resource=
s will also be acquired by the proxy. The proxy class is an actual subclass=
 of the persistent class."
 msgstr ""
 =

-#: performance.xml:335(para) =

+#. Tag: para
+#: performance.xml:329
+#, no-c-format
 msgid "These problems are all due to fundamental limitations in Java's sin=
gle inheritance model. If you wish 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. eg."
 msgstr ""
 =

-#: performance.xml:348(para) =

+#. Tag: programlisting
+#: performance.xml:335
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"CatImpl\" proxy=3D\"Cat\">\n"
+      "    ......\n"
+      "    <subclass name=3D\"DomesticCatImpl\" proxy=3D\"DomesticCat\">\n"
+      "        .....\n"
+      "    </subclass>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:337
+#, no-c-format
 msgid "where <literal>CatImpl</literal> implements the interface <literal>=
Cat</literal> and <literal>DomesticCatImpl</literal> implements the interfa=
ce <literal>DomesticCat</literal>. Then proxies for instances of <literal>C=
at</literal> and <literal>DomesticCat</literal> may be returned by <literal=
>load()</literal> or <literal>iterate()</literal>. (Note that <literal>list=
()</literal> does not usually return proxies.)"
 msgstr ""
 =

-#: performance.xml:360(para) =

+#. Tag: programlisting
+#: performance.xml:345
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D (Cat) session.load(CatImpl.class, catid);\n"
+      "Iterator iter =3D session.createQuery(\"from CatImpl as cat where c=
at.name=3D'fritz'\").iterate();\n"
+      "Cat fritz =3D (Cat) iter.next();]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:347
+#, no-c-format
 msgid "Relationships are also lazily initialized. This means you must decl=
are any properties to be of type <literal>Cat</literal>, not <literal>CatIm=
pl</literal>."
 msgstr ""
 =

-#: performance.xml:365(para) =

+#. Tag: para
+#: performance.xml:352
+#, no-c-format
 msgid "Certain operations do <emphasis>not</emphasis> require proxy initia=
lization"
 msgstr ""
 =

-#: performance.xml:371(para) =

+#. Tag: para
+#: performance.xml:358
+#, no-c-format
 msgid "<literal>equals()</literal>, if the persistent class does not overr=
ide <literal>equals()</literal>"
 msgstr ""
 =

-#: performance.xml:377(para) =

+#. Tag: para
+#: performance.xml:364
+#, no-c-format
 msgid "<literal>hashCode()</literal>, if the persistent class does not ove=
rride <literal>hashCode()</literal>"
 msgstr ""
 =

-#: performance.xml:383(para) =

+#. Tag: para
+#: performance.xml:370
+#, no-c-format
 msgid "The identifier getter method"
 msgstr ""
 =

-#: performance.xml:389(para) =

+#. Tag: para
+#: performance.xml:376
+#, no-c-format
 msgid "Hibernate will detect persistent classes that override <literal>equ=
als()</literal> or <literal>hashCode()</literal>."
 msgstr ""
 =

-#: performance.xml:394(para) =

+#. Tag: para
+#: performance.xml:381
+#, no-c-format
 msgid "By choosing <literal>lazy=3D\"no-proxy\"</literal> instead of the d=
efault <literal>lazy=3D\"proxy\"</literal>, we can avoid the problems assoc=
iated with typecasting. However, we will require buildtime bytecode instrum=
entation, and all operations will result in immediate proxy initialization."
 msgstr ""
 =

-#: performance.xml:404(title) =

+#. Tag: title
+#: performance.xml:391
+#, no-c-format
 msgid "Initializing collections and proxies"
 msgstr ""
 =

-#: performance.xml:406(para) =

+#. Tag: para
+#: performance.xml:393
+#, no-c-format
 msgid "A <literal>LazyInitializationException</literal> will be thrown by =
Hibernate if an uninitialized collection or proxy is accessed outside of th=
e scope of the <literal>Session</literal>, ie. when the entity owning the c=
ollection or having the reference to the proxy is in the detached state."
 msgstr ""
 =

-#: performance.xml:412(para) =

+#. Tag: para
+#: performance.xml:399
+#, no-c-format
 msgid "Sometimes we need to ensure that a proxy or collection is initializ=
ed before closing the <literal>Session</literal>. Of course, we can alway f=
orce initialization by calling <literal>cat.getSex()</literal> or <literal>=
cat.getKittens().size()</literal>, for example. But that is confusing to re=
aders of the code and is not convenient for generic code."
 msgstr ""
 =

-#: performance.xml:419(para) =

+#. Tag: para
+#: performance.xml:406
+#, no-c-format
 msgid "The static methods <literal>Hibernate.initialize()</literal> and <l=
iteral>Hibernate.isInitialized()</literal> provide the application with a c=
onvenient way of working with lazily initialized collections or proxies. <l=
iteral>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 ""
 =

-#: performance.xml:428(para) =

+#. Tag: para
+#: performance.xml:415
+#, no-c-format
 msgid "Another option is to keep the <literal>Session</literal> open until=
 all needed collections and proxies have been loaded. In some application a=
rchitectures, particularly where the code that accesses data using Hibernat=
e, and the code that uses it are in different application layers or differe=
nt physical processes, it can be a problem to ensure that the <literal>Sess=
ion</literal> is open when a collection is initialized. There are two basic=
 ways to deal with this issue:"
 msgstr ""
 =

-#: performance.xml:439(para) =

+#. Tag: para
+#: performance.xml:426
+#, no-c-format
 msgid "In a web-based application, a servlet filter can be used to close t=
he <literal>Session</literal> only at the very 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 vitall=
y important that the <literal>Session</literal> is closed and the transacti=
on 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 ""
 =

-#: performance.xml:452(para) =

+#. Tag: para
+#: performance.xml:439
+#, no-c-format
 msgid "In an application with a separate business tier, the business logic=
 must \"prepare\" all collections that will be needed by the web tier befor=
e 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 <lite=
ral>Hibernate.initialize()</literal> for each collection that will be neede=
d in the web tier (this call must occur before the session is closed) or re=
trieves the collection eagerly using a Hibernate query with a <literal>FETC=
H</literal> clause or a <literal>FetchMode.JOIN</literal> in <literal>Crite=
ria</literal>. This is usually easier if you adopt the <emphasis>Command</e=
mphasis> pattern instead of a <emphasis>Session Facade</emphasis>."
 msgstr ""
 =

-#: performance.xml:467(para) =

+#. Tag: para
+#: performance.xml:454
+#, no-c-format
 msgid "You may also attach a previously loaded object to a new <literal>Se=
ssion</literal> with <literal>merge()</literal> or <literal>lock()</literal=
> before accessing uninitialized collections (or other proxies). No, Hibern=
ate does not, and certainly <emphasis>should</emphasis> not do this automat=
ically, since it would introduce ad hoc transaction semantics!"
 msgstr ""
 =

-#: performance.xml:477(para) =

+#. Tag: para
+#: performance.xml:464
+#, no-c-format
 msgid "Sometimes you don't want to initialize a large collection, but stil=
l need some information about it (like its size) or a subset of the data."
 msgstr ""
 =

-#: performance.xml:482(para) =

+#. Tag: para
+#: performance.xml:469
+#, no-c-format
 msgid "You can use a collection filter to get the size of a collection wit=
hout initializing it:"
 msgstr ""
 =

-#: performance.xml:488(para) =

+#. Tag: programlisting
+#: performance.xml:473
+#, no-c-format
+msgid "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\=
" ).list().get(0) ).intValue()]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:475
+#, no-c-format
 msgid "The <literal>createFilter()</literal> method is also used to effici=
ently retrieve subsets of a collection without needing to initialize the wh=
ole collection:"
 msgstr ""
 =

-#: performance.xml:498(title) =

+#. Tag: programlisting
+#: performance.xml:480
+#, no-c-format
+msgid "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0).se=
tMaxResults(10).list();]]>"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:485
+#, no-c-format
 msgid "Using batch fetching"
 msgstr ""
 =

-#: performance.xml:500(para) =

+#. Tag: para
+#: performance.xml:487
+#, no-c-format
 msgid "Hibernate can make efficient use of batch fetching, that is, Hibern=
ate can load several uninitialized proxies if one proxy is accessed (or col=
lections. Batch fetching is an optimization of the lazy select fetching str=
ategy. There are two ways you can tune batch fetching: on the class and the=
 collection level."
 msgstr ""
 =

-#: performance.xml:506(para) =

+#. Tag: para
+#: performance.xml:493
+#, no-c-format
 msgid "Batch fetching for classes/entities is easier to understand. Imagin=
e you have the following situation at runtime: You have 25 <literal>Cat</li=
teral> instances loaded in a <literal>Session</literal>, each <literal>Cat<=
/literal> has a reference to its <literal>owner</literal>, a <literal>Perso=
n</literal>. The <literal>Person</literal> class is mapped with a proxy, <l=
iteral>lazy=3D\"true\"</literal>. If you now iterate through all cats and c=
all <literal>getOwner()</literal> on each, Hibernate will by default execut=
e 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 ""
 =

-#: performance.xml:518(para) =

+#. Tag: programlisting
+#: performance.xml:503
+#, no-c-format
+msgid "<![CDATA[<class name=3D\"Person\" batch-size=3D\"10\">...</class>]]=
>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:505
+#, no-c-format
 msgid "Hibernate will now execute only three queries, the pattern is 10, 1=
0, 5."
 msgstr ""
 =

-#: performance.xml:522(para) =

-msgid "You may also enable batch fetching of collections. For example, if =
each <literal>Person</literal> has a lazy collection of <literal>Cat</liter=
al>s, and 10 persons are currently loaded in the <literal>Sesssion</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 <lite=
ral>Person</literal>, Hibernate can pre-fetch collections:"
+#. Tag: para
+#: performance.xml:509
+#, no-c-format
+msgid "You may also enable batch fetching of collections. For example, if =
each <literal>Person</literal> has a lazy collection of <literal>Cat</liter=
al>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 f=
etching for the <literal>cats</literal> collection in the mapping of <liter=
al>Person</literal>, Hibernate can pre-fetch collections:"
 msgstr ""
 =

-#: performance.xml:537(para) =

+#. Tag: programlisting
+#: performance.xml:518
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <set name=3D\"cats\" batch-size=3D\"3\">\n"
+      "        ...\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:520
+#, 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 i=
n a particular <literal>Session</literal>."
 msgstr ""
 =

-#: performance.xml:543(para) =

+#. Tag: para
+#: performance.xml:526
+#, no-c-format
 msgid "Batch fetching of collections is particularly useful if you have a =
nested tree of items, ie. the typical bill-of-materials pattern. (Although =
a <emphasis>nested set</emphasis> or a <emphasis>materialized path</emphasi=
s> might be a better option for read-mostly trees.)"
 msgstr ""
 =

-#: performance.xml:552(title) =

+#. Tag: title
+#: performance.xml:535
+#, no-c-format
 msgid "Using subselect fetching"
 msgstr ""
 =

-#: performance.xml:554(para) =

+#. Tag: para
+#: performance.xml:537
+#, no-c-format
 msgid "If one lazy collection or single-valued proxy has to be fetched, Hi=
bernate loads all of them, re-running the original query in a subselect. Th=
is works in the same way as batch-fetching, without the piecemeal loading."
 msgstr ""
 =

-#: performance.xml:565(title) =

+#. Tag: title
+#: performance.xml:548
+#, no-c-format
 msgid "Using lazy property fetching"
 msgstr ""
 =

-#: performance.xml:567(para) =

+#. Tag: para
+#: performance.xml:550
+#, no-c-format
 msgid "Hibernate3 supports the lazy fetching of individual properties. Thi=
s optimization technique is also known as <emphasis>fetch groups</emphasis>=
. Please note that this is mostly a marketing feature, as in practice, opti=
mizing row reads is much more important than optimization of column reads. =
However, only loading some properties of a class might be useful in extreme=
 cases, when legacy tables have hundreds of columns and the data model can =
not be improved."
 msgstr ""
 =

-#: performance.xml:576(para) =

+#. Tag: para
+#: performance.xml:559
+#, no-c-format
 msgid "To enable lazy property loading, set the <literal>lazy</literal> at=
tribute on your particular property mappings:"
 msgstr ""
 =

-#: performance.xml:590(para) =

+#. Tag: programlisting
+#: performance.xml:564
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Document\">\n"
+      "       <id name=3D\"id\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"name\" not-null=3D\"true\" length=3D\"50\"/>=
\n"
+      "    <property name=3D\"summary\" not-null=3D\"true\" length=3D\"200=
\" lazy=3D\"true\"/>\n"
+      "    <property name=3D\"text\" not-null=3D\"true\" length=3D\"2000\"=
 lazy=3D\"true\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:566
+#, no-c-format
 msgid "Lazy property loading requires buildtime bytecode instrumentation! =
If your persistent classes are not enhanced, Hibernate will silently ignore=
 lazy property settings and fall back to immediate fetching."
 msgstr ""
 =

-#: performance.xml:596(para) =

+#. Tag: para
+#: performance.xml:572
+#, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr ""
 =

-#: performance.xml:614(para) =

-msgid "A different (better?) way to avoid unnecessary column reads, at lea=
st for read-only transactions is to use the projection features of HQL or C=
riteria queries. This avoids the need for buildtime bytecode processing and=
 is certainly a prefered solution."
+#. Tag: programlisting
+#: performance.xml:576
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"instrument\" depends=3D\"compile\">\n"
+      "    <taskdef name=3D\"instrument\" classname=3D\"org.hibernate.tool=
.instrument.InstrumentTask\">\n"
+      "        <classpath path=3D\"${jar.path}\"/>\n"
+      "        <classpath path=3D\"${classes.dir}\"/>\n"
+      "        <classpath refid=3D\"lib.class.path\"/>\n"
+      "    </taskdef>\n"
+      "\n"
+      "    <instrument verbose=3D\"true\">\n"
+      "        <fileset dir=3D\"${testclasses.dir}/org/hibernate/auction/m=
odel\">\n"
+      "            <include name=3D\"*.class\"/>\n"
+      "        </fileset>\n"
+      "    </instrument>\n"
+      "</target>]]>"
 msgstr ""
 =

-#: performance.xml:621(para) =

+#. Tag: para
+#: performance.xml:578
+#, no-c-format
+msgid "A different (better?) way to avoid unnecessary column reads, at lea=
st for read-only transactions is to use the projection features of HQL or C=
riteria queries. This avoids the need for buildtime bytecode processing and=
 is certainly a preferred solution."
+msgstr ""
+
+#. Tag: para
+#: performance.xml:585
+#, no-c-format
 msgid "You may force the usual eager fetching of properties using <literal=
>fetch all properties</literal> in HQL."
 msgstr ""
 =

-#: performance.xml:631(title) =

+#. Tag: title
+#: performance.xml:595
+#, no-c-format
 msgid "The Second Level Cache"
 msgstr ""
 =

-#: performance.xml:633(para) =

+#. Tag: para
+#: performance.xml:597
+#, 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 (<l=
iteral>SessionFactory</literal>-level) cache on a class-by-class and collec=
tion-by-collection basis. You may even plug in a clustered cache. Be carefu=
l. Caches are never aware of changes made to the persistent store by anothe=
r application (though they may be configured to regularly expire cached dat=
a)."
 msgstr ""
 =

-#: performance.xml:641(para) =

+#. Tag: para
+#: performance.xml:605
+#, 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.hiber=
nate.cache.CacheProvider</literal> using the property <literal>hibernate.ca=
che.provider_class</literal>. Hibernate comes bundled with a number of buil=
t-in integrations with open-source cache providers (listed below); addition=
ally, you could implement your own and plug it in as outlined above. Note t=
hat versions prior to 3.2 defaulted to use EhCache as the default cache pro=
vider; that is no longer the case as of 3.2."
 msgstr ""
 =

-#: performance.xml:652(title) =

+#. Tag: title
+#: performance.xml:616
+#, no-c-format
 msgid "Cache Providers"
 msgstr ""
 =

-#: performance.xml:661(entry) performance.xml:848(entry) =

+#. Tag: entry
+#: performance.xml:625 performance.xml:813
+#, no-c-format
 msgid "Cache"
 msgstr ""
 =

-#: performance.xml:662(entry) =

+#. Tag: entry
+#: performance.xml:626
+#, no-c-format
 msgid "Provider class"
 msgstr ""
 =

-#: performance.xml:663(entry) =

+#. Tag: entry
+#: performance.xml:627
+#, no-c-format
 msgid "Type"
 msgstr ""
 =

-#: performance.xml:664(entry) =

+#. Tag: entry
+#: performance.xml:628
+#, no-c-format
 msgid "Cluster Safe"
 msgstr ""
 =

-#: performance.xml:665(entry) =

+#. Tag: entry
+#: performance.xml:629
+#, no-c-format
 msgid "Query Cache Supported"
 msgstr ""
 =

-#: performance.xml:670(entry) performance.xml:857(entry) =

+#. Tag: entry
+#: performance.xml:634 performance.xml:822
+#, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr ""
 =

-#: performance.xml:671(literal) =

+#. Tag: literal
+#: performance.xml:635
+#, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr ""
 =

-#: performance.xml:672(entry) =

+#. Tag: entry
+#: performance.xml:636
+#, no-c-format
 msgid "memory"
 msgstr ""
 =

-#: performance.xml:674(entry) performance.xml:681(entry) performance.xml:6=
88(entry) performance.xml:858(entry) performance.xml:859(entry) performance=
.xml:860(entry) performance.xml:865(entry) performance.xml:866(entry) perfo=
rmance.xml:867(entry) performance.xml:872(entry) performance.xml:873(entry)=
 performance.xml:874(entry) performance.xml:879(entry) performance.xml:880(=
entry) performance.xml:886(entry) performance.xml:889(entry) =

-msgid "yes"
+#. Tag: entry
+#: performance.xml:638 performance.xml:645 performance.xml:652 performance=
.xml:823 performance.xml:824 performance.xml:825 performance.xml:830 perfor=
mance.xml:831 performance.xml:832 performance.xml:837 performance.xml:838 p=
erformance.xml:839 performance.xml:844 performance.xml:845 performance.xml:=
851 performance.xml:854 performance.xml:858 performance.xml:861
+#, no-c-format
+msgid "<entry>yes</entry>"
 msgstr ""
 =

-#: performance.xml:677(entry) performance.xml:864(entry) =

+#. Tag: entry
+#: performance.xml:641 performance.xml:829
+#, no-c-format
 msgid "EHCache"
 msgstr ""
 =

-#: performance.xml:678(literal) =

+#. Tag: literal
+#: performance.xml:642
+#, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr ""
 =

-#: performance.xml:679(entry) performance.xml:686(entry) =

+#. Tag: entry
+#: performance.xml:643 performance.xml:650
+#, no-c-format
 msgid "memory, disk"
 msgstr ""
 =

-#: performance.xml:684(entry) performance.xml:871(entry) =

+#. Tag: entry
+#: performance.xml:648 performance.xml:836
+#, no-c-format
 msgid "OSCache"
 msgstr ""
 =

-#: performance.xml:685(literal) =

+#. Tag: literal
+#: performance.xml:649
+#, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr ""
 =

-#: performance.xml:691(entry) performance.xml:878(entry) =

+#. Tag: entry
+#: performance.xml:655 performance.xml:843
+#, no-c-format
 msgid "SwarmCache"
 msgstr ""
 =

-#: performance.xml:692(literal) =

+#. Tag: literal
+#: performance.xml:656
+#, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr ""
 =

-#: performance.xml:693(entry) =

+#. Tag: entry
+#: performance.xml:657
+#, no-c-format
 msgid "clustered (ip multicast)"
 msgstr ""
 =

-#: performance.xml:694(entry) =

+#. Tag: entry
+#: performance.xml:658
+#, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr ""
 =

-#: performance.xml:698(entry) performance.xml:885(entry) =

-msgid "JBoss TreeCache"
+#. Tag: entry
+#: performance.xml:662 performance.xml:850
+#, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr ""
 =

-#: performance.xml:699(literal) =

+#. Tag: literal
+#: performance.xml:663
+#, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr ""
 =

-#: performance.xml:700(entry) =

+#. Tag: entry
+#: performance.xml:664 performance.xml:671
+#, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr ""
 =

-#: performance.xml:701(entry) =

+#. Tag: entry
+#: performance.xml:665
+#, no-c-format
 msgid "yes (replication)"
 msgstr ""
 =

-#: performance.xml:702(entry) =

+#. Tag: entry
+#: performance.xml:666 performance.xml:673
+#, no-c-format
 msgid "yes (clock sync req.)"
 msgstr ""
 =

-#: performance.xml:709(title) =

+#. Tag: entry
+#: performance.xml:669 performance.xml:857
+#, no-c-format
+msgid "JBoss Cache 2"
+msgstr ""
+
+#. Tag: literal
+#: performance.xml:670
+#, no-c-format
+msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgstr ""
+
+#. Tag: entry
+#: performance.xml:672
+#, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:680
+#, no-c-format
 msgid "Cache mappings"
 msgstr ""
 =

-#: performance.xml:711(para) =

+#. Tag: para
+#: performance.xml:682
+#, no-c-format
 msgid "The <literal>&lt;cache&gt;</literal> element of a class or collecti=
on mapping has the following form:"
 msgstr ""
 =

-#: performance.xml:729(para) =

+#. Tag: programlisting
+#: performance.xml:693
+#, no-c-format
+msgid ""
+      "<![CDATA[<cache \n"
+      "    usage=3D\"transactional|read-write|nonstrict-read-write|read-on=
ly\"\n"
+      "    region=3D\"RegionName\"\n"
+      "    include=3D\"all|non-lazy\"\n"
+      "/>]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:696
+#, 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 ""
 =

-#: performance.xml:738(para) =

+#. Tag: para
+#: performance.xml:705
+#, no-c-format
 msgid "<literal>region</literal> (optional, defaults to the class or colle=
ction role name) specifies the name of the second level cache region"
 msgstr ""
 =

-#: performance.xml:745(para) =

+#. Tag: para
+#: performance.xml:712
+#, no-c-format
 msgid "<literal>include</literal> (optional, defaults to <literal>all</lit=
eral>) <literal>non-lazy</literal> specifies that properties of the entity =
mapped with <literal>lazy=3D\"true\"</literal> may not be cached when attri=
bute-level lazy fetching is enabled"
 msgstr ""
 =

-#: performance.xml:755(para) =

-msgid "Alternatively (preferrably?), you may specify <literal>&lt;class-ca=
che&gt;</literal> and <literal>&lt;collection-cache&gt;</literal> elements =
in <literal>hibernate.cfg.xml</literal>."
+#. Tag: para
+#: performance.xml:722
+#, no-c-format
+msgid "Alternatively (preferably?), you may specify <literal>&lt;class-cac=
he&gt;</literal> and <literal>&lt;collection-cache&gt;</literal> elements i=
n <literal>hibernate.cfg.xml</literal>."
 msgstr ""
 =

-#: performance.xml:760(para) =

+#. Tag: para
+#: performance.xml:727
+#, no-c-format
 msgid "The <literal>usage</literal> attribute specifies a <emphasis>cache =
concurrency strategy</emphasis>."
 msgstr ""
 =

-#: performance.xml:767(title) =

+#. Tag: title
+#: performance.xml:734
+#, no-c-format
 msgid "Strategy: read only"
 msgstr ""
 =

-#: performance.xml:769(para) =

+#. Tag: para
+#: performance.xml:736
+#, no-c-format
 msgid "If your application needs to read but never modify instances of a p=
ersistent class, a <literal>read-only</literal> cache may be used. This is =
the simplest and best performing strategy. It's even perfectly safe for use=
 in a cluster."
 msgstr ""
 =

-#: performance.xml:784(title) =

+#. Tag: programlisting
+#: performance.xml:742
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Immutable\" mutable=3D\"false\">\n"
+      "    <cache usage=3D\"read-only\"/>\n"
+      "    ....\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:748
+#, no-c-format
 msgid "Strategy: read/write"
 msgstr ""
 =

-#: performance.xml:786(para) =

+#. Tag: para
+#: performance.xml:750
+#, no-c-format
 msgid "If the application needs to update data, a <literal>read-write</lit=
eral> cache might be appropriate. This cache strategy should never be used =
if serializable transaction isolation level is required. If the cache is us=
ed in a JTA environment, you must specify the property <literal>hibernate.t=
ransaction.manager_lookup_class</literal>, naming a strategy for obtaining =
the JTA <literal>TransactionManager</literal>. In other environments, you s=
hould ensure that the transaction is completed when <literal>Session.close(=
)</literal> or <literal>Session.disconnect()</literal> is called. If you wi=
sh to use this strategy in a cluster, you should ensure that the underlying=
 cache implementation supports locking. The built-in cache providers do <em=
phasis>not</emphasis>."
 msgstr ""
 =

-#: performance.xml:809(title) =

+#. Tag: programlisting
+#: performance.xml:761
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"eg.Cat\" .... >\n"
+      "    <cache usage=3D\"read-write\"/>\n"
+      "    ....\n"
+      "    <set name=3D\"kittens\" ... >\n"
+      "        <cache usage=3D\"read-write\"/>\n"
+      "        ....\n"
+      "    </set>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:766
+#, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr ""
 =

-#: performance.xml:811(para) =

+#. Tag: para
+#: performance.xml:768
+#, no-c-format
 msgid "If the application only occasionally needs to update data (ie. if i=
t is extremely unlikely that two transactions would try to update the same =
item simultaneously) and strict transaction isolation is not required, a <l=
iteral>nonstrict-read-write</literal> cache might be appropriate. If the ca=
che is used in a JTA environment, you must specify <literal>hibernate.trans=
action.manager_lookup_class</literal>. In other environments, you should en=
sure that the transaction is completed when <literal>Session.close()</liter=
al> or <literal>Session.disconnect()</literal> is called."
 msgstr ""
 =

-#: performance.xml:823(title) =

+#. Tag: title
+#: performance.xml:780
+#, no-c-format
 msgid "Strategy: transactional"
 msgstr ""
 =

-#: performance.xml:825(para) =

+#. Tag: para
+#: performance.xml:782
+#, no-c-format
 msgid "The <literal>transactional</literal> cache strategy provides suppor=
t for fully transactional cache providers such as JBoss TreeCache. Such a c=
ache may only be used in a JTA environment and you must specify <literal>hi=
bernate.transaction.manager_lookup_class</literal>."
 msgstr ""
 =

-#: performance.xml:833(para) =

-msgid "None of the cache providers support all of the cache concurrency st=
rategies. The following table shows which providers are compatible with whi=
ch concurrency strategies."
+#. Tag: title
+#: performance.xml:791
+#, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
 msgstr ""
 =

-#: performance.xml:839(title) =

+#. Tag: para
+#: performance.xml:794
+#, no-c-format
+msgid "None of the cache providers support all of the cache concurrency st=
rategies."
+msgstr ""
+
+#. Tag: para
+#: performance.xml:799
+#, no-c-format
+msgid "The following table shows which providers are compatible with which=
 concurrency strategies."
+msgstr ""
+
+#. Tag: title
+#: performance.xml:804
+#, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr ""
 =

-#: performance.xml:849(entry) =

+#. Tag: entry
+#: performance.xml:814
+#, no-c-format
 msgid "read-only"
 msgstr ""
 =

-#: performance.xml:850(entry) =

+#. Tag: entry
+#: performance.xml:815
+#, no-c-format
 msgid "nonstrict-read-write"
 msgstr ""
 =

-#: performance.xml:851(entry) =

+#. Tag: entry
+#: performance.xml:816
+#, no-c-format
 msgid "read-write"
 msgstr ""
 =

-#: performance.xml:852(entry) =

+#. Tag: entry
+#: performance.xml:817
+#, no-c-format
 msgid "transactional"
 msgstr ""
 =

-#: performance.xml:898(title) =

+#. Tag: title
+#: performance.xml:872
+#, no-c-format
 msgid "Managing the caches"
 msgstr ""
 =

-#: performance.xml:900(para) =

+#. Tag: para
+#: performance.xml:874
+#, no-c-format
 msgid "Whenever you pass an object to <literal>save()</literal>, <literal>=
update()</literal> or <literal>saveOrUpdate()</literal> and whenever you re=
trieve 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>Se=
ssion</literal>."
 msgstr ""
 =

-#: performance.xml:907(para) =

+#. Tag: para
+#: performance.xml:881
+#, no-c-format
 msgid "When <literal>flush()</literal> is subsequently called, the state o=
f that object will be synchronized with the database. If you do not want th=
is synchronization to occur or if you are processing a huge number of objec=
ts and need to manage memory efficiently, the <literal>evict()</literal> me=
thod may be used to remove the object and its collections from the first-le=
vel cache."
 msgstr ""
 =

-#: performance.xml:922(para) =

+#. Tag: programlisting
+#: performance.xml:889
+#, no-c-format
+msgid ""
+      "<![CDATA[ScrollableResult cats =3D sess.createQuery(\"from Cat as c=
at\").scroll(); //a huge result set\n"
+      "while ( cats.next() ) {\n"
+      "    Cat cat =3D (Cat) cats.get(0);\n"
+      "    doSomethingWithACat(cat);\n"
+      "    sess.evict(cat);\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:891
+#, 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 ""
 =

-#: performance.xml:927(para) =

+#. Tag: para
+#: performance.xml:896
+#, no-c-format
 msgid "To completely evict all objects from the session cache, call <liter=
al>Session.clear()</literal>"
 msgstr ""
 =

-#: performance.xml:931(para) =

+#. Tag: para
+#: performance.xml:900
+#, no-c-format
 msgid "For the second-level cache, there are methods defined on <literal>S=
essionFactory</literal> for evicting the cached state of an instance, entir=
e class, collection instance or entire collection role."
 msgstr ""
 =

-#: performance.xml:942(para) =

+#. Tag: programlisting
+#: performance.xml:906
+#, no-c-format
+msgid ""
+      "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particul=
ar Cat\n"
+      "sessionFactory.evict(Cat.class);  //evict all Cats\n"
+      "sessionFactory.evictCollection(\"Cat.kittens\", catId); //evict a p=
articular collection of kittens\n"
+      "sessionFactory.evictCollection(\"Cat.kittens\"); //evict all kitten=
 collections]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:908
+#, no-c-format
 msgid "The <literal>CacheMode</literal> controls how a particular session =
interacts with the second-level cache."
 msgstr ""
 =

-#: performance.xml:949(para) =

+#. Tag: para
+#: performance.xml:915
+#, no-c-format
 msgid "<literal>CacheMode.NORMAL</literal> - read items from and write ite=
ms to the second-level cache"
 msgstr ""
 =

-#: performance.xml:954(para) =

+#. Tag: para
+#: performance.xml:920
+#, no-c-format
 msgid "<literal>CacheMode.GET</literal> - read items from the second-level=
 cache, but don't write to the second-level cache except when updating data"
 msgstr ""
 =

-#: performance.xml:960(para) =

+#. Tag: para
+#: performance.xml:926
+#, no-c-format
 msgid "<literal>CacheMode.PUT</literal> - write items to the second-level =
cache, but don't read from the second-level cache"
 msgstr ""
 =

-#: performance.xml:966(para) =

+#. Tag: para
+#: performance.xml:932
+#, no-c-format
 msgid "<literal>CacheMode.REFRESH</literal> - write items to the second-le=
vel cache, but don't 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 ""
 =

-#: performance.xml:974(para) =

+#. Tag: para
+#: performance.xml:940
+#, no-c-format
 msgid "To browse the contents of a second-level or query cache region, use=
 the <literal>Statistics</literal> API:"
 msgstr ""
 =

-#: performance.xml:983(para) =

+#. Tag: programlisting
+#: performance.xml:945
+#, no-c-format
+msgid ""
+      "<![CDATA[Map cacheEntries =3D sessionFactory.getStatistics()\n"
+      "        .getSecondLevelCacheStatistics(regionName)\n"
+      "        .getEntries();]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:947
+#, no-c-format
 msgid "You'll need to enable statistics, and, optionally, force Hibernate =
to keep the cache entries in a more human-understandable format:"
 msgstr ""
 =

-#: performance.xml:994(title) =

+#. Tag: programlisting
+#: performance.xml:952
+#, no-c-format
+msgid ""
+      "<![CDATA[hibernate.generate_statistics true\n"
+      "hibernate.cache.use_structured_entries true]]>"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:957
+#, no-c-format
 msgid "The Query Cache"
 msgstr ""
 =

-#: performance.xml:996(para) =

+#. Tag: para
+#: performance.xml:959
+#, no-c-format
 msgid "Query result sets may also be cached. This is only useful for queri=
es that are run frequently with the same parameters. To use the query cache=
 you must first enable it:"
 msgstr ""
 =

-#: performance.xml:1003(para) =

+#. Tag: programlisting
+#: performance.xml:964
+#, no-c-format
+msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:966
+#, no-c-format
 msgid "This setting causes the creation of two new cache regions - one hol=
ding cached query result sets (<literal>org.hibernate.cache.StandardQueryCa=
che</literal>), the other holding timestamps of the most recent updates to =
queryable tables (<literal>org.hibernate.cache.UpdateTimestampsCache</liter=
al>). Note that the query cache does not cache the state of the actual enti=
ties in the result set; it caches only identifier values and results of val=
ue type. So the query cache should always be used in conjunction with the s=
econd-level cache."
 msgstr ""
 =

-#: performance.xml:1013(para) =

+#. Tag: para
+#: performance.xml:976
+#, no-c-format
 msgid "Most queries do not benefit from caching, so by default queries are=
 not cached. To enable caching, call <literal>Query.setCacheable(true)</lit=
eral>. This call allows the query to look for existing cache results or add=
 its results to the cache when it is executed."
 msgstr ""
 =

-#: performance.xml:1020(para) =

+#. Tag: para
+#: performance.xml:983
+#, no-c-format
 msgid "If you require fine-grained control over query cache expiration pol=
icies, you may specify a named cache region for a particular query by calli=
ng <literal>Query.setCacheRegion()</literal>."
 msgstr ""
 =

-#: performance.xml:1033(para) =

+#. Tag: programlisting
+#: performance.xml:989
+#, no-c-format
+msgid ""
+      "<![CDATA[List blogs =3D sess.createQuery(\"from Blog blog where blo=
g.blogger =3D :blogger\")\n"
+      "    .setEntity(\"blogger\", blogger)\n"
+      "    .setMaxResults(15)\n"
+      "    .setCacheable(true)\n"
+      "    .setCacheRegion(\"frontpages\")\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:991
+#, no-c-format
 msgid "If the query should force a refresh of its query cache region, you =
should call <literal>Query.setCacheMode(CacheMode.REFRESH)</literal>. This =
is particularly useful in cases where underlying data may have been updated=
 via a separate process (i.e., not modified through Hibernate) and allows t=
he application to selectively refresh particular query result sets. This is=
 a more efficient alternative to eviction of a query cache region via <lite=
ral>SessionFactory.evictQueries()</literal>."
 msgstr ""
 =

-#: performance.xml:1045(title) =

+#. Tag: title
+#: performance.xml:1003
+#, no-c-format
 msgid "Understanding Collection performance"
 msgstr ""
 =

-#: performance.xml:1047(para) =

+#. Tag: para
+#: performance.xml:1005
+#, no-c-format
 msgid "We've already spent quite some time talking about collections. In t=
his section we will highlight a couple more issues about how collections be=
have at runtime."
 msgstr ""
 =

-#: performance.xml:1054(title) =

+#. Tag: title
+#: performance.xml:1012
+#, no-c-format
 msgid "Taxonomy"
 msgstr ""
 =

-#: performance.xml:1056(para) =

+#. Tag: para
+#: performance.xml:1014
+#, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr ""
 =

-#: performance.xml:1060(para) =

+#. Tag: para
+#: performance.xml:1018
+#, no-c-format
 msgid "collections of values"
 msgstr ""
 =

-#: performance.xml:1063(para) =

+#. Tag: para
+#: performance.xml:1021
+#, no-c-format
 msgid "one to many associations"
 msgstr ""
 =

-#: performance.xml:1066(para) =

+#. Tag: para
+#: performance.xml:1024
+#, no-c-format
 msgid "many to many associations"
 msgstr ""
 =

-#: performance.xml:1070(para) =

+#. Tag: para
+#: performance.xml:1028
+#, 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 perf=
ormance characteristics, we must also consider the structure of the primary=
 key that is used by Hibernate to update or delete collection rows. This su=
ggests the following classification:"
 msgstr ""
 =

-#: performance.xml:1081(para) =

+#. Tag: para
+#: performance.xml:1039
+#, no-c-format
 msgid "indexed collections"
 msgstr ""
 =

-#: performance.xml:1084(para) =

+#. Tag: para
+#: performance.xml:1042
+#, no-c-format
 msgid "sets"
 msgstr ""
 =

-#: performance.xml:1087(para) =

+#. Tag: para
+#: performance.xml:1045
+#, no-c-format
 msgid "bags"
 msgstr ""
 =

-#: performance.xml:1091(para) =

+#. Tag: para
+#: performance.xml:1049
+#, no-c-format
 msgid "All indexed collections (maps, lists, arrays) have a primary key co=
nsisting of the <literal>&lt;key&gt;</literal> and <literal>&lt;index&gt;</=
literal> columns. In this case collection updates are usually extremely eff=
icient - the primary key may be efficiently indexed and a particular row ma=
y be efficiently located when Hibernate tries to update or delete it."
 msgstr ""
 =

-#: performance.xml:1099(para) =

-msgid "Sets have a primary key consisting of <literal>&lt;key&gt;</literal=
> and element columns. This may be less efficient for some types of collect=
ion element, particularly composite elements or large text or binary fields=
; the database may not be able to index a complex primary key as efficently=
. On the other hand, for one to many or many to many associations, particul=
arly in the case of synthetic identifiers, it is likely to be just as effic=
ient. (Side-note: if you want <literal>SchemaExport</literal> to actually c=
reate the primary key of a <literal>&lt;set&gt;</literal> for you, you must=
 declare all columns as <literal>not-null=3D\"true\"</literal>.)"
+#. Tag: para
+#: performance.xml:1057
+#, no-c-format
+msgid "Sets have a primary key consisting of <literal>&lt;key&gt;</literal=
> and element columns. This may be less efficient for some types of collect=
ion element, particularly composite elements or large text or binary fields=
; the database may not be able to index a complex primary key as efficientl=
y. On the other hand, for one to many or many to many associations, particu=
larly in the case of synthetic identifiers, it is likely to be just as effi=
cient. (Side-note: if you want <literal>SchemaExport</literal> to actually =
create the primary key of a <literal>&lt;set&gt;</literal> for you, you mus=
t declare all columns as <literal>not-null=3D\"true\"</literal>.)"
 msgstr ""
 =

-#: performance.xml:1110(para) =

+#. Tag: para
+#: performance.xml:1068
+#, no-c-format
 msgid "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, s=
o they are always very efficient to update. In fact, they are the best case=
."
 msgstr ""
 =

-#: performance.xml:1115(para) =

+#. Tag: para
+#: performance.xml:1073
+#, no-c-format
 msgid "Bags are the worst case. Since a bag permits duplicate element valu=
es and has no index column, no primary key may be defined. Hibernate has no=
 way of distinguishing between duplicate rows. Hibernate resolves this prob=
lem by completely removing (in a single <literal>DELETE</literal>) and recr=
eating the collection whenever it changes. This might be very inefficient."
 msgstr ""
 =

-#: performance.xml:1123(para) =

+#. Tag: para
+#: performance.xml:1081
+#, no-c-format
 msgid "Note that for a one-to-many association, the \"primary key\" may no=
t be the physical primary key of the database table - but even in this case=
, the above classification is still useful. (It still reflects how Hibernat=
e \"locates\" individual rows of the collection.)"
 msgstr ""
 =

-#: performance.xml:1133(title) =

+#. Tag: title
+#: performance.xml:1091
+#, no-c-format
 msgid "Lists, maps, idbags and sets are the most efficient collections to =
update"
 msgstr ""
 =

-#: performance.xml:1135(para) =

+#. Tag: para
+#: performance.xml:1093
+#, no-c-format
 msgid "From the discussion above, it should be clear that indexed collecti=
ons and (usually) sets allow the most efficient operation in terms of addin=
g, removing and updating elements."
 msgstr ""
 =

-#: performance.xml:1141(para) =

+#. Tag: para
+#: performance.xml:1099
+#, no-c-format
 msgid "There is, arguably, one more advantage that indexed collections hav=
e over sets for many to many associations or collections of values. Because=
 of the structure of a <literal>Set</literal>, Hibernate doesn't ever <lite=
ral>UPDATE</literal> a row when an element is \"changed\". Changes to a <li=
teral>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 ""
 =

-#: performance.xml:1150(para) =

+#. Tag: para
+#: performance.xml:1108
+#, no-c-format
 msgid "After observing that arrays cannot be lazy, we would conclude that =
lists, maps and idbags are the most performant (non-inverse) collection typ=
es, with sets not far behind. Sets are expected to be the most common kind =
of collection in Hibernate applications. This is because the \"set\" semant=
ics are most natural in the relational model."
 msgstr ""
 =

-#: performance.xml:1158(para) =

+#. Tag: para
+#: performance.xml:1116
+#, no-c-format
 msgid "However, in well-designed Hibernate domain models, we usually see t=
hat most collections are in fact one-to-many associations with <literal>inv=
erse=3D\"true\"</literal>. For these associations, the update is handled by=
 the many-to-one end of the association, and so considerations of collectio=
n update performance simply do not apply."
 msgstr ""
 =

-#: performance.xml:1168(title) =

+#. Tag: title
+#: performance.xml:1126
+#, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr ""
 =

-#: performance.xml:1170(para) =

+#. Tag: para
+#: performance.xml:1128
+#, no-c-format
 msgid "Just before you ditch bags forever, there is a particular case in w=
hich bags (and also lists) are much more performant than sets. For a collec=
tion with <literal>inverse=3D\"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 bec=
ause <literal>Collection.add()</literal> or <literal>Collection.addAll()</l=
iteral> must always return true for a bag or <literal>List</literal> (unlik=
e a <literal>Set</literal>). This can make the following common code much f=
aster."
 msgstr ""
 =

-#: performance.xml:1189(title) =

+#. Tag: programlisting
+#: performance.xml:1138
+#, no-c-format
+msgid ""
+      "<![CDATA[Parent p =3D (Parent) sess.load(Parent.class, id);\n"
+      "Child c =3D new Child();\n"
+      "c.setParent(p);\n"
+      "p.getChildren().add(c);  //no need to fetch the collection!\n"
+      "sess.flush();]]>"
+msgstr ""
+
+#. Tag: title
+#: performance.xml:1143
+#, no-c-format
 msgid "One shot delete"
 msgstr ""
 =

-#: performance.xml:1191(para) =

+#. Tag: para
+#: performance.xml:1145
+#, no-c-format
 msgid "Occasionally, deleting collection elements one by one can be extrem=
ely inefficient. Hibernate isn't completely stupid, so it knows not to do t=
hat in the case of an newly-empty collection (if you called <literal>list.c=
lear()</literal>, for example). In this case, Hibernate will issue a single=
 <literal>DELETE</literal> and we are done!"
 msgstr ""
 =

-#: performance.xml:1198(para) =

+#. Tag: para
+#: performance.xml:1152
+#, no-c-format
 msgid "Suppose we add 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 collec=
tion is a bag). This is certainly desirable."
 msgstr ""
 =

-#: performance.xml:1204(para) =

+#. Tag: para
+#: performance.xml:1158
+#, 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 ""
 =

-#: performance.xml:1211(para) =

+#. Tag: para
+#: performance.xml:1165
+#, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr ""
 =

-#: performance.xml:1214(para) =

+#. Tag: para
+#: performance.xml:1168
+#, no-c-format
 msgid "remove the whole collection (in one SQL <literal>DELETE</literal>) =
and insert all five current elements (one by one)"
 msgstr ""
 =

-#: performance.xml:1219(para) =

+#. Tag: para
+#: performance.xml:1173
+#, no-c-format
 msgid "Hibernate isn't smart enough to know that the second option is prob=
ably quicker in this case. (And it would probably be undesirable for Hibern=
ate to be that smart; such behaviour might confuse database triggers, etc.)"
 msgstr ""
 =

-#: performance.xml:1225(para) =

+#. Tag: para
+#: performance.xml:1179
+#, no-c-format
 msgid "Fortunately, you can force this behaviour (ie. the second strategy)=
 at any time by discarding (ie. dereferencing) the original collection and =
returning a newly instantiated collection with all the current elements. Th=
is can be very useful and powerful from time to time."
 msgstr ""
 =

-#: performance.xml:1231(para) =

+#. Tag: para
+#: performance.xml:1185
+#, no-c-format
 msgid "Of course, one-shot-delete does not apply to collections mapped <li=
teral>inverse=3D\"true\"</literal>."
 msgstr ""
 =

-#: performance.xml:1240(title) =

+#. Tag: title
+#: performance.xml:1194
+#, no-c-format
 msgid "Monitoring performance"
 msgstr ""
 =

-#: performance.xml:1242(para) =

+#. Tag: para
+#: performance.xml:1196
+#, no-c-format
 msgid "Optimization is not much use without monitoring and access to perfo=
rmance numbers. Hibernate provides a full range of figures about its intern=
al operations. Statistics in Hibernate are available per <literal>SessionFa=
ctory</literal>."
 msgstr ""
 =

-#: performance.xml:1249(title) =

+#. Tag: title
+#: performance.xml:1203
+#, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr ""
 =

-#: performance.xml:1251(para) =

+#. Tag: para
+#: performance.xml:1205
+#, no-c-format
 msgid "You can access <literal>SessionFactory</literal> metrics in two way=
s. Your first option is to call <literal>sessionFactory.getStatistics()</li=
teral> and read or display the <literal>Statistics</literal> yourself."
 msgstr ""
 =

-#: performance.xml:1257(para) =

+#. Tag: para
+#: performance.xml:1211
+#, no-c-format
 msgid "Hibernate can also use JMX to publish metrics if you enable the <li=
teral>StatisticsService</literal> MBean. You may enable a single MBean for =
all your <literal>SessionFactory</literal> or one per factory. See the foll=
owing code for minimalistic configuration examples:"
 msgstr ""
 =

-#: performance.xml:1284(para) =

+#. Tag: programlisting
+#: performance.xml:1218
+#, no-c-format
+msgid ""
+      "<![CDATA[// MBean service registration for a specific SessionFactor=
y\n"
+      "Hashtable tb =3D new Hashtable();\n"
+      "tb.put(\"type\", \"statistics\");\n"
+      "tb.put(\"sessionFactory\", \"myFinancialApp\");\n"
+      "ObjectName on =3D new ObjectName(\"hibernate\", tb); // MBean objec=
t name\n"
+      "\n"
+      "StatisticsService stats =3D new StatisticsService(); // MBean imple=
mentation\n"
+      "stats.setSessionFactory(sessionFactory); // Bind the stats to a Ses=
sionFactory\n"
+      "server.registerMBean(stats, on); // Register the Mbean on the serve=
r]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: performance.xml:1221
+#, no-c-format
+msgid ""
+      "<![CDATA[// MBean service registration for all SessionFactory's\n"
+      "Hashtable tb =3D new Hashtable();\n"
+      "tb.put(\"type\", \"statistics\");\n"
+      "tb.put(\"sessionFactory\", \"all\");\n"
+      "ObjectName on =3D new ObjectName(\"hibernate\", tb); // MBean objec=
t name\n"
+      "\n"
+      "StatisticsService stats =3D new StatisticsService(); // MBean imple=
mentation\n"
+      "server.registerMBean(stats, on); // Register the MBean on the serve=
r]]>"
+msgstr ""
+
+#. Tag: para
+#: performance.xml:1223
+#, no-c-format
 msgid "TODO: This doesn't make sense: In the first case, we retrieve and u=
se the MBean directly. In the second one, we must give the JNDI name in whi=
ch the session factory is held before using it. Use <literal>hibernateStats=
Bean.setSessionFactoryJNDIName(\"my/JNDI/Name\")</literal>"
 msgstr ""
 =

-#: performance.xml:1289(para) =

+#. Tag: para
+#: performance.xml:1228
+#, no-c-format
 msgid "You can (de)activate the monitoring for a <literal>SessionFactory</=
literal>"
 msgstr ""
 =

-#: performance.xml:1294(para) =

+#. Tag: para
+#: performance.xml:1233
+#, no-c-format
 msgid "at configuration time, set <literal>hibernate.generate_statistics</=
literal> to <literal>false</literal>"
 msgstr ""
 =

-#: performance.xml:1301(para) =

+#. Tag: para
+#: performance.xml:1240
+#, no-c-format
 msgid "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)<=
/literal> or <literal>hibernateStatsBean.setStatisticsEnabled(true)</litera=
l>"
 msgstr ""
 =

-#: performance.xml:1308(para) =

-msgid "Statistics can be reset programatically using the <literal>clear()<=
/literal> method. A summary can be sent to a logger (info level) using the =
<literal>logSummary()</literal> method."
+#. Tag: para
+#: performance.xml:1247
+#, 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 ""
 =

-#: performance.xml:1317(title) =

+#. Tag: title
+#: performance.xml:1256
+#, no-c-format
 msgid "Metrics"
 msgstr ""
 =

-#: performance.xml:1319(para) =

+#. Tag: para
+#: performance.xml:1258
+#, no-c-format
 msgid "Hibernate provides a number of metrics, from very basic to the spec=
ialized information only relevant in certain scenarios. All available count=
ers are described in the <literal>Statistics</literal> interface API, in th=
ree categories:"
 msgstr ""
 =

-#: performance.xml:1326(para) =

+#. Tag: para
+#: performance.xml:1265
+#, no-c-format
 msgid "Metrics related to the general <literal>Session</literal> usage, su=
ch as number of open sessions, retrieved JDBC connections, etc."
 msgstr ""
 =

-#: performance.xml:1332(para) =

+#. Tag: para
+#: performance.xml:1271
+#, no-c-format
 msgid "Metrics related to he entities, collections, queries, and caches as=
 a whole (aka global metrics),"
 msgstr ""
 =

-#: performance.xml:1338(para) =

+#. Tag: para
+#: performance.xml:1277
+#, no-c-format
 msgid "Detailed metrics related to a particular entity, collection, query =
or cache region."
 msgstr ""
 =

-#: performance.xml:1345(para) =

-msgid "For exampl,e you can check the cache hit, miss, and put ratio of en=
tities, collections and queries, and the average time a query needs. Beware=
 that the number of milliseconds is subject to approximation in Java. Hiber=
nate is tied to the JVM precision, on some platforms this might even only b=
e accurate to 10 seconds."
+#. Tag: para
+#: performance.xml:1284
+#, no-c-format
+msgid "For example, you can check the cache hit, miss, and put ratio of en=
tities, collections and queries, and the average time a query needs. Beware=
 that the number of milliseconds is subject to approximation in Java. Hiber=
nate is tied to the JVM precision, on some platforms this might even only b=
e accurate to 10 seconds."
 msgstr ""
 =

-#: performance.xml:1352(para) =

+#. Tag: para
+#: performance.xml:1291
+#, 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 th=
e metrics of a particular entity, collection or cache region through its na=
me, and through its HQL or SQL representation for queries. Please refer to =
the <literal>Statistics</literal>, <literal>EntityStatistics</literal>, <li=
teral>CollectionStatistics</literal>, <literal>SecondLevelCacheStatistics</=
literal>, and <literal>QueryStatistics</literal> API Javadoc for more infor=
mation. The following code shows a simple example:"
 msgstr ""
 =

-#: performance.xml:1379(para) =

-msgid "To work on all entities, collections, queries and region caches, yo=
u can retrieve the list of names of entities, collections, queries and regi=
on caches with the following methods: <literal>getQueries()</literal>, <lit=
eral>getEntityNames()</literal>, <literal>getCollectionRoleNames()</literal=
>, and <literal>getSecondLevelCacheRegionNames()</literal>."
+#. Tag: programlisting
+#: performance.xml:1301
+#, no-c-format
+msgid ""
+      "<![CDATA[Statistics stats =3D HibernateUtil.sessionFactory.getStati=
stics();\n"
+      "\n"
+      "double queryCacheHitCount  =3D stats.getQueryCacheHitCount();\n"
+      "double queryCacheMissCount =3D stats.getQueryCacheMissCount();\n"
+      "double queryCacheHitRatio =3D\n"
+      "  queryCacheHitCount / (queryCacheHitCount + queryCacheMissCount);\=
n"
+      "\n"
+      "log.info(\"Query Hit ratio:\" + queryCacheHitRatio);\n"
+      "\n"
+      "EntityStatistics entityStats =3D\n"
+      "  stats.getEntityStatistics( Cat.class.getName() );\n"
+      "long changes =3D\n"
+      "        entityStats.getInsertCount()\n"
+      "        + entityStats.getUpdateCount()\n"
+      "        + entityStats.getDeleteCount();\n"
+      "log.info(Cat.class.getName() + \" changed \" + changes + \"times\" =
 );]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: performance.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: performance.xml:1303
+#, no-c-format
+msgid "To work on all entities, collections, queries and region caches, yo=
u can retrieve the list of names of entities, collections, queries and regi=
on caches with the following methods: <literal>getQueries()</literal>, <lit=
eral>getEntityNames()</literal>, <literal>getCollectionRoleNames()</literal=
>, and <literal>getSecondLevelCacheRegionNames()</literal>."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/pers=
istent_classes.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/persistent=
_classes.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/persistent=
_classes.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,208 +1,566 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:33-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: persistent_classes.xml:5(title) =

+#. Tag: title
+#: persistent_classes.xml:29
+#, no-c-format
 msgid "Persistent Classes"
 msgstr ""
 =

-#: persistent_classes.xml:7(para) =

+#. Tag: para
+#: persistent_classes.xml:31
+#, no-c-format
 msgid "Persistent classes are classes in an application that implement the=
 entities of the business problem (e.g. Customer and Order in an E-commerce=
 application). Not all instances of a persistent class are considered to be=
 in the persistent state - an instance may instead be transient or detached=
."
 msgstr ""
 =

-#: persistent_classes.xml:14(para) =

+#. Tag: para
+#: persistent_classes.xml:38
+#, no-c-format
 msgid "Hibernate works best if these classes follow some simple rules, als=
o known as the Plain Old Java Object (POJO) programming model. However, non=
e of these rules are hard requirements. Indeed, Hibernate3 assumes very lit=
tle about the nature of your persistent objects. You may express a domain m=
odel in other ways: using trees of <literal>Map</literal> instances, for ex=
ample."
 msgstr ""
 =

-#: persistent_classes.xml:23(title) =

+#. Tag: title
+#: persistent_classes.xml:47
+#, no-c-format
 msgid "A simple POJO example"
 msgstr ""
 =

-#: persistent_classes.xml:25(para) =

+#. Tag: para
+#: persistent_classes.xml:49
+#, no-c-format
 msgid "Most Java applications require a persistent class representing feli=
nes."
 msgstr ""
 =

-#: persistent_classes.xml:108(para) =

+#. Tag: programlisting
+#: persistent_classes.xml:53
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "import java.util.Set;\n"
+      "import java.util.Date;\n"
+      "\n"
+      "public class Cat {\n"
+      "    private Long id; // identifier\n"
+      "\n"
+      "    private Date birthdate;\n"
+      "    private Color color;\n"
+      "    private char sex;\n"
+      "    private float weight;\n"
+      "    private int litterId;\n"
+      "\n"
+      "    private Cat mother;\n"
+      "    private Set kittens =3D new HashSet();\n"
+      "\n"
+      "    private void setId(Long id) {\n"
+      "        this.id=3Did;\n"
+      "    }\n"
+      "    public Long getId() {\n"
+      "        return id;\n"
+      "    }\n"
+      "\n"
+      "    void setBirthdate(Date date) {\n"
+      "        birthdate =3D date;\n"
+      "    }\n"
+      "    public Date getBirthdate() {\n"
+      "        return birthdate;\n"
+      "    }\n"
+      "\n"
+      "    void setWeight(float weight) {\n"
+      "        this.weight =3D weight;\n"
+      "    }\n"
+      "    public float getWeight() {\n"
+      "        return weight;\n"
+      "    }\n"
+      "\n"
+      "    public Color getColor() {\n"
+      "        return color;\n"
+      "    }\n"
+      "    void setColor(Color color) {\n"
+      "        this.color =3D color;\n"
+      "    }\n"
+      "\n"
+      "    void setSex(char sex) {\n"
+      "        this.sex=3Dsex;\n"
+      "    }\n"
+      "    public char getSex() {\n"
+      "        return sex;\n"
+      "    }\n"
+      "\n"
+      "    void setLitterId(int id) {\n"
+      "        this.litterId =3D id;\n"
+      "    }\n"
+      "    public int getLitterId() {\n"
+      "        return litterId;\n"
+      "    }\n"
+      "\n"
+      "    void setMother(Cat mother) {\n"
+      "        this.mother =3D mother;\n"
+      "    }\n"
+      "    public Cat getMother() {\n"
+      "        return mother;\n"
+      "    }\n"
+      "    void setKittens(Set kittens) {\n"
+      "        this.kittens =3D kittens;\n"
+      "    }\n"
+      "    public Set getKittens() {\n"
+      "        return kittens;\n"
+      "    }\n"
+      "    \n"
+      "    // addKitten not needed by Hibernate\n"
+      "    public void addKitten(Cat kitten) {\n"
+      "            kitten.setMother(this);\n"
+      "        kitten.setLitterId( kittens.size() ); \n"
+      "        kittens.add(kitten);\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:55
+#, no-c-format
 msgid "There are four main rules to follow here:"
 msgstr ""
 =

-#: persistent_classes.xml:114(title) =

+#. Tag: title
+#: persistent_classes.xml:61
+#, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr ""
 =

-#: persistent_classes.xml:116(para) =

+#. Tag: para
+#: persistent_classes.xml:63
+#, no-c-format
 msgid "<literal>Cat</literal> has a no-argument constructor. All persisten=
t classes must have a default constructor (which may be non-public) so that=
 Hibernate can instantiate them using <literal>Constructor.newInstance()</l=
iteral>. We strongly recommend having a default constructor with at least <=
emphasis>package</emphasis> visibility for runtime proxy generation in Hibe=
rnate."
 msgstr ""
 =

-#: persistent_classes.xml:126(title) =

+#. Tag: title
+#: persistent_classes.xml:73
+#, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr ""
 =

-#: persistent_classes.xml:128(para) =

+#. Tag: para
+#: persistent_classes.xml:75
+#, no-c-format
 msgid "<literal>Cat</literal> has a property called <literal>id</literal>.=
 This property maps to the primary key column of a database table. The prop=
erty might have been called anything, and its type might have been any prim=
itive type, any primitive \"wrapper\" type, <literal>java.lang.String</lite=
ral> or <literal>java.util.Date</literal>. (If your legacy database table h=
as composite keys, you can even use a user-defined class with properties of=
 these types - see the section on composite identifiers later.)"
 msgstr ""
 =

-#: persistent_classes.xml:137(para) =

+#. Tag: para
+#: persistent_classes.xml:84
+#, no-c-format
 msgid "The identifier property is strictly optional. You can leave them of=
f and let Hibernate keep track of object identifiers internally. We do not =
recommend this, however."
 msgstr ""
 =

-#: persistent_classes.xml:142(para) =

+#. Tag: para
+#: persistent_classes.xml:89
+#, no-c-format
 msgid "In fact, some functionality is available only to classes which decl=
are an identifier property:"
 msgstr ""
 =

-#: persistent_classes.xml:149(para) =

-msgid "Transitive reattachment for detached objects (cascade update or cas=
cade merge) - see <xref linkend=3D\"objectstate-transitive\"/>"
+#. Tag: para
+#: persistent_classes.xml:96
+#, no-c-format
+msgid "Transitive reattachment for detached objects (cascade update or cas=
cade merge) - see"
 msgstr ""
 =

-#: persistent_classes.xml:156(literal) =

+#. Tag: literal
+#: persistent_classes.xml:103
+#, no-c-format
 msgid "Session.saveOrUpdate()"
 msgstr ""
 =

-#: persistent_classes.xml:161(literal) =

+#. Tag: literal
+#: persistent_classes.xml:108
+#, no-c-format
 msgid "Session.merge()"
 msgstr ""
 =

-#: persistent_classes.xml:166(para) =

+#. Tag: para
+#: persistent_classes.xml:113
+#, no-c-format
 msgid "We recommend you declare consistently-named identifier properties o=
n persistent classes. We further recommend that you use a nullable (ie. non=
-primitive) type."
 msgstr ""
 =

-#: persistent_classes.xml:173(title) =

+#. Tag: title
+#: persistent_classes.xml:120
+#, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr ""
 =

-#: persistent_classes.xml:174(para) =

+#. Tag: para
+#: persistent_classes.xml:121
+#, no-c-format
 msgid "A central feature of Hibernate, <emphasis>proxies</emphasis>, depen=
ds upon the persistent class being either non-final, or the implementation =
of an interface that declares all public methods."
 msgstr ""
 =

-#: persistent_classes.xml:179(para) =

+#. Tag: para
+#: persistent_classes.xml:126
+#, no-c-format
 msgid "You can persist <literal>final</literal> classes that do not implem=
ent an interface with Hibernate, but you won't be able to use proxies for l=
azy association fetching - which will limit your options for performance tu=
ning."
 msgstr ""
 =

-#: persistent_classes.xml:184(para) =

+#. Tag: para
+#: persistent_classes.xml:131
+#, no-c-format
 msgid "You should also avoid declaring <literal>public final</literal> met=
hods on the non-final classes. If you want to use a class with a <literal>p=
ublic final</literal> method, you must explicitly disable proxying by setti=
ng <literal>lazy=3D\"false\"</literal>."
 msgstr ""
 =

-#: persistent_classes.xml:192(title) =

+#. Tag: title
+#: persistent_classes.xml:139
+#, no-c-format
 msgid "Declare accessors and mutators for persistent fields (optional)"
 msgstr ""
 =

-#: persistent_classes.xml:194(para) =

+#. Tag: para
+#: persistent_classes.xml:141
+#, no-c-format
 msgid "<literal>Cat</literal> declares accessor methods for all its persis=
tent fields. Many other ORM tools directly persist instance variables. We b=
elieve it is better to provide an indirection between the relational schema=
 and internal data structures of the class. By default, Hibernate persists =
JavaBeans style properties, and recognizes method names of the form <litera=
l>getFoo</literal>, <literal>isFoo</literal> and <literal>setFoo</literal>.=
 You may switch to direct field access for particular properties, if needed=
."
 msgstr ""
 =

-#: persistent_classes.xml:204(para) =

+#. Tag: para
+#: persistent_classes.xml:151
+#, no-c-format
 msgid "Properties need <emphasis>not</emphasis> be declared public - Hiber=
nate can persist a property with a default, <literal>protected</literal> or=
 <literal>private</literal> get / set pair."
 msgstr ""
 =

-#: persistent_classes.xml:215(title) =

+#. Tag: title
+#: persistent_classes.xml:162
+#, no-c-format
 msgid "Implementing inheritance"
 msgstr ""
 =

-#: persistent_classes.xml:217(para) =

+#. Tag: para
+#: persistent_classes.xml:164
+#, no-c-format
 msgid "A subclass must also observe the first and second rules. It inherit=
s its identifier property from the superclass, <literal>Cat</literal>."
 msgstr ""
 =

-#: persistent_classes.xml:237(title) =

+#. Tag: programlisting
+#: persistent_classes.xml:169
+#, no-c-format
+msgid ""
+      "<![CDATA[package eg;\n"
+      "\n"
+      "public class DomesticCat extends Cat {\n"
+      "        private String name;\n"
+      "\n"
+      "        public String getName() {\n"
+      "                return name;\n"
+      "        }\n"
+      "        protected void setName(String name) {\n"
+      "                this.name=3Dname;\n"
+      "        }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: persistent_classes.xml:173
+#, no-c-format
 msgid "Implementing <literal>equals()</literal> and <literal>hashCode()</l=
iteral>"
 msgstr ""
 =

-#: persistent_classes.xml:239(para) =

+#. Tag: para
+#: persistent_classes.xml:175
+#, no-c-format
 msgid "You have to override the <literal>equals()</literal> and <literal>h=
ashCode()</literal> methods if you"
 msgstr ""
 =

-#: persistent_classes.xml:245(para) =

+#. Tag: para
+#: persistent_classes.xml:181
+#, no-c-format
 msgid "intend to put instances of persistent classes in a <literal>Set</li=
teral> (the recommended way to represent many-valued associations) <emphasi=
s>and</emphasis>"
 msgstr ""
 =

-#: persistent_classes.xml:252(para) =

+#. Tag: para
+#: persistent_classes.xml:188
+#, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr ""
 =

-#: persistent_classes.xml:258(para) =

+#. Tag: para
+#: persistent_classes.xml:194
+#, no-c-format
 msgid "Hibernate guarantees equivalence of persistent identity (database r=
ow) and Java identity only inside a particular session scope. So as soon as=
 we mix instances retrieved in different sessions, we must implement <liter=
al>equals()</literal> and <literal>hashCode()</literal> if we wish to have =
meaningful semantics for <literal>Set</literal>s."
 msgstr ""
 =

-#: persistent_classes.xml:266(para) =

+#. Tag: para
+#: persistent_classes.xml:202
+#, no-c-format
 msgid "The most obvious way is to implement <literal>equals()</literal>/<l=
iteral>hashCode()</literal> by comparing the identifier value of both objec=
ts. If the value is the same, both must be the same database row, they are =
therefore equal (if both are added to a <literal>Set</literal>, we will onl=
y have one element in the <literal>Set</literal>). Unfortunately, we can't =
use that approach with generated identifiers! Hibernate will only assign id=
entifier values to objects that are persistent, a newly created instance wi=
ll not have any identifier value! Furthermore, if an instance is unsaved an=
d currently in a <literal>Set</literal>, saving it will assign an identifie=
r value to the object. If <literal>equals()</literal> and <literal>hashCode=
()</literal> are based on the identifier value, the hash code would change,=
 breaking the contract of the <literal>Set</literal>. See the Hibernate web=
site for a full discussion of this problem. Note that this is not a Hiberna=
te issue, but !
 normal Java semantics of object identity and equality."
 msgstr ""
 =

-#: persistent_classes.xml:280(para) =

+#. Tag: para
+#: persistent_classes.xml:216
+#, no-c-format
 msgid "We recommend implementing <literal>equals()</literal> and <literal>=
hashCode()</literal> using <emphasis>Business key equality</emphasis>. Busi=
ness key equality means that the <literal>equals()</literal> method compare=
s only the properties that form the business key, a key that would identify=
 our instance in the real world (a <emphasis>natural</emphasis> candidate k=
ey):"
 msgstr ""
 =

-#: persistent_classes.xml:312(para) =

+#. Tag: programlisting
+#: persistent_classes.xml:224
+#, no-c-format
+msgid ""
+      "<![CDATA[public class Cat {\n"
+      "\n"
+      "    ...\n"
+      "    public boolean equals(Object other) {\n"
+      "        if (this =3D=3D other) return true;\n"
+      "        if ( !(other instanceof Cat) ) return false;\n"
+      "\n"
+      "        final Cat cat =3D (Cat) other;\n"
+      "\n"
+      "        if ( !cat.getLitterId().equals( getLitterId() ) ) return fa=
lse;\n"
+      "        if ( !cat.getMother().equals( getMother() ) ) return false;=
\n"
+      "\n"
+      "        return true;\n"
+      "    }\n"
+      "\n"
+      "    public int hashCode() {\n"
+      "        int result;\n"
+      "        result =3D getMother().hashCode();\n"
+      "        result =3D 29 * result + getLitterId();\n"
+      "        return result;\n"
+      "    }\n"
+      "\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:226
+#, no-c-format
 msgid "Note that a business key does not have to be as solid as a database=
 primary key candidate (see <xref linkend=3D\"transactions-basics-identity\=
"/>). Immutable or unique properties are usually good candidates for a busi=
ness key."
 msgstr ""
 =

-#: persistent_classes.xml:322(title) =

+#. Tag: title
+#: persistent_classes.xml:236
+#, no-c-format
 msgid "Dynamic models"
 msgstr ""
 =

-#: persistent_classes.xml:325(emphasis) =

+#. Tag: emphasis
+#: persistent_classes.xml:239
+#, no-c-format
 msgid "Note that the following features are currently considered experimen=
tal and may change in the near future."
 msgstr ""
 =

-#: persistent_classes.xml:329(para) =

+#. Tag: para
+#: persistent_classes.xml:243
+#, no-c-format
 msgid "Persistent entities don't necessarily have to be represented as POJ=
O classes or as JavaBean objects at runtime. Hibernate also supports dynami=
c models (using <literal>Map</literal>s of <literal>Map</literal>s at runti=
me) and the representation of entities as DOM4J trees. With this approach, =
you don't write persistent classes, only mapping files."
 msgstr ""
 =

-#: persistent_classes.xml:337(para) =

+#. Tag: para
+#: persistent_classes.xml:251
+#, no-c-format
 msgid "By default, Hibernate works in normal POJO mode. You may set a defa=
ult entity representation mode for a particular <literal>SessionFactory</li=
teral> using the <literal>default_entity_mode</literal> configuration optio=
n (see <xref linkend=3D\"configuration-optional-properties\"/>."
 msgstr ""
 =

-#: persistent_classes.xml:344(para) =

+#. Tag: para
+#: persistent_classes.xml:258
+#, no-c-format
 msgid "The following examples demonstrates the representation using <liter=
al>Map</literal>s. First, in the mapping file, an <literal>entity-name</lit=
eral> has to be declared instead of (or in addition to) a class name:"
 msgstr ""
 =

-#: persistent_classes.xml:384(para) =

+#. Tag: programlisting
+#: persistent_classes.xml:264
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class entity-name=3D\"Customer\">\n"
+      "\n"
+      "        <id name=3D\"id\"\n"
+      "            type=3D\"long\"\n"
+      "            column=3D\"ID\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "\n"
+      "        <property name=3D\"name\"\n"
+      "            column=3D\"NAME\"\n"
+      "            type=3D\"string\"/>\n"
+      "\n"
+      "        <property name=3D\"address\"\n"
+      "            column=3D\"ADDRESS\"\n"
+      "            type=3D\"string\"/>\n"
+      "\n"
+      "        <many-to-one name=3D\"organization\"\n"
+      "            column=3D\"ORGANIZATION_ID\"\n"
+      "            class=3D\"Organization\"/>\n"
+      "\n"
+      "        <bag name=3D\"orders\"\n"
+      "            inverse=3D\"true\"\n"
+      "            lazy=3D\"false\"\n"
+      "            cascade=3D\"all\">\n"
+      "            <key column=3D\"CUSTOMER_ID\"/>\n"
+      "            <one-to-many class=3D\"Order\"/>\n"
+      "        </bag>\n"
+      "\n"
+      "    </class>\n"
+      "    \n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:266
+#, no-c-format
 msgid "Note that even though associations are declared using target class =
names, the target type of an associations may also be a dynamic entity inst=
ead of a POJO."
 msgstr ""
 =

-#: persistent_classes.xml:391(para) =

+#. Tag: para
+#: persistent_classes.xml:273
+#, no-c-format
 msgid "After setting the default entity mode to <literal>dynamic-map</lite=
ral> for the <literal>SessionFactory</literal>, we can at runtime work with=
 <literal>Map</literal>s of <literal>Map</literal>s:"
 msgstr ""
 =

-#: persistent_classes.xml:419(para) =

+#. Tag: programlisting
+#: persistent_classes.xml:279
+#, no-c-format
+msgid ""
+      "<![CDATA[Session s =3D openSession();\n"
+      "Transaction tx =3D s.beginTransaction();\n"
+      "Session s =3D openSession();\n"
+      "\n"
+      "// Create a customer\n"
+      "Map david =3D new HashMap();\n"
+      "david.put(\"name\", \"David\");\n"
+      "\n"
+      "// Create an organization\n"
+      "Map foobar =3D new HashMap();\n"
+      "foobar.put(\"name\", \"Foobar Inc.\");\n"
+      "\n"
+      "// Link both\n"
+      "david.put(\"organization\", foobar);\n"
+      "\n"
+      "// Save both\n"
+      "s.save(\"Customer\", david);\n"
+      "s.save(\"Organization\", foobar);\n"
+      "\n"
+      "tx.commit();\n"
+      "s.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:281
+#, no-c-format
 msgid "The advantages of a dynamic mapping are quick turnaround time for p=
rototyping without the need for entity class implementation. However, you l=
ose compile-time type checking and will very likely deal with many exceptio=
ns at runtime. Thanks to the Hibernate mapping, the database schema can eas=
ily be normalized and sound, allowing to add a proper domain model implemen=
tation on top later on."
 msgstr ""
 =

-#: persistent_classes.xml:427(para) =

+#. Tag: para
+#: persistent_classes.xml:289
+#, no-c-format
 msgid "Entity representation modes can also be set on a per <literal>Sessi=
on</literal> basis:"
 msgstr ""
 =

-#: persistent_classes.xml:446(para) =

+#. Tag: programlisting
+#: persistent_classes.xml:294
+#, no-c-format
+msgid ""
+      "<![CDATA[Session dynamicSession =3D pojoSession.getSession(EntityMo=
de.MAP);\n"
+      "\n"
+      "// Create a customer\n"
+      "Map david =3D new HashMap();\n"
+      "david.put(\"name\", \"David\");\n"
+      "dynamicSession.save(\"Customer\", david);\n"
+      "...\n"
+      "dynamicSession.flush();\n"
+      "dynamicSession.close()\n"
+      "...\n"
+      "// Continue on pojoSession\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: persistent_classes.xml:297
+#, no-c-format
 msgid "Please note that the call to <literal>getSession()</literal> using =
an <literal>EntityMode</literal> is on the <literal>Session</literal> API, =
not the <literal>SessionFactory</literal>. That way, the new <literal>Sessi=
on</literal> shares the underlying JDBC connection, transaction, and other =
context information. This means you don't have tocall <literal>flush()</lit=
eral> and <literal>close()</literal> on the secondary <literal>Session</lit=
eral>, and also leave the transaction and connection handling to the primar=
y unit of work."
 msgstr ""
 =

-#: persistent_classes.xml:456(para) =

+#. Tag: para
+#: persistent_classes.xml:307
+#, no-c-format
 msgid "More information about the XML representation capabilities can be f=
ound in <xref linkend=3D\"xml\"/>."
 msgstr ""
 =

-#: persistent_classes.xml:464(title) =

+#. Tag: title
+#: persistent_classes.xml:315
+#, no-c-format
 msgid "Tuplizers"
 msgstr ""
 =

-#: persistent_classes.xml:466(para) =

+#. Tag: para
+#: persistent_classes.xml:317
+#, no-c-format
 msgid "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interf=
aces, are responsible for managing a particular representation of a piece o=
f data, given that representation's <literal>org.hibernate.EntityMode</lite=
ral>. If a given piece of data is thought of as a data structure, then a tu=
plizer is the thing which knows how to create such a data structure and how=
 to extract values from and inject values into such a data structure. For e=
xample, for the POJO entity mode, the correpsonding tuplizer knows how crea=
te the POJO through its constructor and how to access the POJO properties u=
sing the defined property accessors. There are two high-level types of Tupl=
izers, represented by the <literal>org.hibernate.tuple.entity.EntityTuplize=
r</literal> and <literal>org.hibernate.tuple.component.ComponentTuplizer</l=
iteral> interfaces. <literal>EntityTuplizer</literal>s are responsible for =
managing the above mentioned contracts in regards to entities, while <liter=
al>ComponentTu!
 plizer</literal>s do the same for components."
 msgstr ""
 =

-#: persistent_classes.xml:481(para) =

+#. Tag: para
+#: persistent_classes.xml:332
+#, no-c-format
 msgid "Users may also plug in their own tuplizers. Perhaps you require tha=
t a <literal>java.util.Map</literal> implementation other than <literal>jav=
a.util.HashMap</literal> be used while in the dynamic-map entity-mode; or p=
erhaps you need to define a different proxy generation strategy than the on=
e used by default. Both would be achieved by defining a custom tuplizer imp=
lementation. Tuplizers definitions are attached to the entity or component =
mapping they are meant to manage. Going back to the example of our customer=
 entity:"
 msgstr ""
 =

-#: persistent_classes.xml:529(para) =

-msgid "TODO: Document user-extension framework in the property and proxy p=
ackages"
+#. Tag: programlisting
+#: persistent_classes.xml:341
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "    <class entity-name=3D\"Customer\">\n"
+      "        <!--\n"
+      "            Override the dynamic-map entity-mode\n"
+      "            tuplizer for the customer entity\n"
+      "        -->\n"
+      "        <tuplizer entity-mode=3D\"dynamic-map\"\n"
+      "                class=3D\"CustomMapTuplizerImpl\"/>\n"
+      "\n"
+      "        <id name=3D\"id\" type=3D\"long\" column=3D\"ID\">\n"
+      "            <generator class=3D\"sequence\"/>\n"
+      "        </id>\n"
+      "\n"
+      "        <!-- other properties -->\n"
+      "        ...\n"
+      "    </class>\n"
+      "</hibernate-mapping>\n"
+      "\n"
+      "\n"
+      "public class CustomMapTuplizerImpl\n"
+      "        extends org.hibernate.tuple.entity.DynamicMapEntityTuplizer=
 {\n"
+      "    // override the buildInstantiator() method to plug in our custo=
m map...\n"
+      "    protected final Instantiator buildInstantiator(\n"
+      "            org.hibernate.mapping.PersistentClass mappingInfo) {\n"
+      "        return new CustomMapInstantiator( mappingInfo );\n"
+      "    }\n"
+      "\n"
+      "    private static final class CustomMapInstantiator\n"
+      "            extends org.hibernate.tuple.DynamicMapInstantitor {\n"
+      "        // override the generateMap() method to return our custom m=
ap...\n"
+      "            protected final Map generateMap() {\n"
+      "                    return new CustomMap();\n"
+      "            }\n"
+      "    }\n"
+      "}]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: persistent_classes.xml:0(None) =

-msgid "translator-credits"
+#. Tag: title
+#: persistent_classes.xml:347
+#, no-c-format
+msgid "Extentsions"
 msgstr ""
 =

+#. Tag: para
+#: persistent_classes.xml:348
+#, no-c-format
+msgid "TODO: Document user-extension framework in the property and proxy p=
ackages"
+msgstr ""
+

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/pref=
ace.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/preface.po=
t	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/preface.po=
t	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,72 +1,100 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:33-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: preface.xml:21(title) =

+#. Tag: title
+#: preface.xml:29
+#, no-c-format
 msgid "Preface"
 msgstr ""
 =

-#: preface.xml:23(para) =

+#. Tag: para
+#: preface.xml:31
+#, no-c-format
 msgid "Working with object-oriented software and a relational database can=
 be cumbersome and time consuming in today's enterprise environments. Hiber=
nate is an object/relational mapping tool for Java environments. The term o=
bject/relational mapping (ORM) refers to the technique of mapping a data re=
presentation from an object model to a relational data model with a SQL-bas=
ed schema."
 msgstr ""
 =

-#: preface.xml:31(para) =

+#. Tag: para
+#: preface.xml:39
+#, no-c-format
 msgid "Hibernate not only takes care of the mapping from Java classes to d=
atabase tables (and from Java data types to SQL data types), but also provi=
des data query and retrieval facilities and can significantly reduce develo=
pment time otherwise spent with manual data handling in SQL and JDBC."
 msgstr ""
 =

-#: preface.xml:38(para) =

+#. Tag: para
+#: preface.xml:46
+#, no-c-format
 msgid "Hibernates goal is to relieve the developer from 95 percent of comm=
on data persistence related programming tasks. Hibernate may not be the bes=
t solution for data-centric applications that only use stored-procedures to=
 implement the business logic in the database, it is most useful with objec=
t-oriented domain models and business logic in the Java-based middle-tier. =
However, Hibernate can certainly help you to remove or encapsulate vendor-s=
pecific SQL code and will help with the common task of result set translati=
on from a tabular representation to a graph of objects."
 msgstr ""
 =

-#: preface.xml:48(para) =

+#. Tag: para
+#: preface.xml:56
+#, no-c-format
 msgid "If you are new to Hibernate and Object/Relational Mapping or even J=
ava, please follow these steps:"
 msgstr ""
 =

-#: preface.xml:55(para) =

+#. Tag: para
+#: preface.xml:63
+#, no-c-format
 msgid "Read <xref linkend=3D\"tutorial\"/> for a tutorial with step-by-ste=
p instructions. The source code for the tutorial is included in the distrib=
ution in the <literal>doc/reference/tutorial/</literal> directory."
 msgstr ""
 =

-#: preface.xml:63(para) =

+#. Tag: para
+#: preface.xml:71
+#, no-c-format
 msgid "Read <xref linkend=3D\"architecture\"/> to understand the environme=
nts where Hibernate can be used."
 msgstr ""
 =

-#: preface.xml:69(para) =

+#. Tag: para
+#: preface.xml:77
+#, no-c-format
 msgid "Have a look at the <literal>eg/</literal> directory in the Hibernat=
e distribution, it contains a simple standalone application. Copy your JDBC=
 driver to the <literal>lib/</literal> directory and edit <literal>etc/hibe=
rnate.properties</literal>, specifying correct values for your database. Fr=
om a command prompt in the distribution directory, type <literal>ant eg</li=
teral> (using Ant), or under Windows, type <literal>build eg</literal>."
 msgstr ""
 =

-#: preface.xml:80(para) =

+#. Tag: para
+#: preface.xml:88
+#, no-c-format
 msgid "Use this reference documentation as your primary source of informat=
ion. Consider reading <emphasis>Java Persistence with Hibernate</emphasis> =
(http://www.manning.com/bauer2) if you need more help with application desi=
gn or if you prefer a step-by-step tutorial. Also visit http://caveatemptor=
.hibernate.org and download the example application for Java Persistence wi=
th Hibernate."
 msgstr ""
 =

-#: preface.xml:90(para) =

+#. Tag: para
+#: preface.xml:98
+#, no-c-format
 msgid "FAQs are answered on the Hibernate website."
 msgstr ""
 =

-#: preface.xml:95(para) =

+#. Tag: para
+#: preface.xml:103
+#, no-c-format
 msgid "Third party demos, examples, and tutorials are linked on the Hibern=
ate website."
 msgstr ""
 =

-#: preface.xml:101(para) =

+#. Tag: para
+#: preface.xml:109
+#, no-c-format
 msgid "The Community Area on the Hibernate website is a good resource for =
design patterns and various integration solutions (Tomcat, JBoss AS, Struts=
, EJB, etc.)."
 msgstr ""
 =

-#: preface.xml:109(para) =

+#. Tag: para
+#: preface.xml:117
+#, no-c-format
 msgid "If you have questions, use the user forum linked on the Hibernate w=
ebsite. We also provide a JIRA issue trackings system for bug reports and f=
eature requests. If you are interested in the development of Hibernate, joi=
n the developer mailing list. If you are interested in translating this doc=
umentation into your language, contact us on the developer mailing list."
 msgstr ""
 =

-#: preface.xml:117(para) =

+#. Tag: para
+#: preface.xml:125
+#, no-c-format
 msgid "Commercial development support, production support, and training fo=
r Hibernate is available through JBoss Inc. (see http://www.hibernate.org/S=
upportTraining/). Hibernate is a Professional Open Source project and a cri=
tical component of the JBoss Enterprise Middleware System (JEMS) suite of p=
roducts."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: preface.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/quer=
y_criteria.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_crit=
eria.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_crit=
eria.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,184 +1,630 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:33-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: query_criteria.xml:5(title) =

+#. Tag: title
+#: query_criteria.xml:29
+#, no-c-format
 msgid "Criteria Queries"
 msgstr ""
 =

-#: query_criteria.xml:7(para) =

+#. Tag: para
+#: query_criteria.xml:31
+#, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr ""
 =

-#: query_criteria.xml:12(title) =

+#. Tag: title
+#: query_criteria.xml:36
+#, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr ""
 =

-#: query_criteria.xml:14(para) =

+#. Tag: para
+#: query_criteria.xml:38
+#, no-c-format
 msgid "The interface <literal>org.hibernate.Criteria</literal> represents =
a query against a particular persistent class. The <literal>Session</litera=
l> is a factory for <literal>Criteria</literal> instances."
 msgstr ""
 =

-#: query_criteria.xml:27(title) =

+#. Tag: programlisting
+#: query_criteria.xml:44
+#, no-c-format
+msgid ""
+      "<![CDATA[Criteria crit =3D sess.createCriteria(Cat.class);\n"
+      "crit.setMaxResults(50);\n"
+      "List cats =3D crit.list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:49
+#, no-c-format
 msgid "Narrowing the result set"
 msgstr ""
 =

-#: query_criteria.xml:29(para) =

+#. Tag: para
+#: query_criteria.xml:51
+#, no-c-format
 msgid "An individual query criterion is an instance of the interface <lite=
ral>org.hibernate.criterion.Criterion</literal>. The class <literal>org.hib=
ernate.criterion.Restrictions</literal> defines factory methods for obtaini=
ng certain built-in <literal>Criterion</literal> types."
 msgstr ""
 =

-#: query_criteria.xml:42(para) =

+#. Tag: programlisting
+#: query_criteria.xml:59
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
+      "    .add( Restrictions.between(\"weight\", minWeight, maxWeight) )\=
n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:61
+#, no-c-format
 msgid "Restrictions may be grouped logically."
 msgstr ""
 =

-#: query_criteria.xml:64(para) =

+#. Tag: programlisting
+#: query_criteria.xml:65
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
+      "    .add( Restrictions.or(\n"
+      "        Restrictions.eq( \"age\", new Integer(0) ),\n"
+      "        Restrictions.isNull(\"age\")\n"
+      "    ) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:67
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.in( \"name\", new String[] { \"Fritz\", \"Iz=
i\", \"Pk\" } ) )\n"
+      "    .add( Restrictions.disjunction()\n"
+      "        .add( Restrictions.isNull(\"age\") )\n"
+      "        .add( Restrictions.eq(\"age\", new Integer(0) ) )\n"
+      "        .add( Restrictions.eq(\"age\", new Integer(1) ) )\n"
+      "        .add( Restrictions.eq(\"age\", new Integer(2) ) )\n"
+      "    ) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:69
+#, no-c-format
 msgid "There are quite a range of built-in criterion types (<literal>Restr=
ictions</literal> subclasses), but one that is especially useful lets you s=
pecify SQL directly."
 msgstr ""
 =

-#: query_criteria.xml:73(para) =

+#. Tag: programlisting
+#: query_criteria.xml:74
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.sqlRestriction(\"lower({alias}.name) like lo=
wer(?)\", \"Fritz%\", Hibernate.STRING) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:76
+#, no-c-format
 msgid "The <literal>{alias}</literal> placeholder with be replaced by the =
row alias of the queried entity."
 msgstr ""
 =

-#: query_criteria.xml:78(para) =

+#. Tag: para
+#: query_criteria.xml:81
+#, no-c-format
 msgid "An alternative approach to obtaining a criterion is to get it from =
a <literal>Property</literal> instance. You can create a <literal>Property<=
/literal> by calling <literal>Property.forName()</literal>."
 msgstr ""
 =

-#: query_criteria.xml:99(title) =

+#. Tag: programlisting
+#: query_criteria.xml:87
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "Property age =3D Property.forName(\"age\");\n"
+      "List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.disjunction()\n"
+      "        .add( age.isNull() )\n"
+      "        .add( age.eq( new Integer(0) ) )\n"
+      "        .add( age.eq( new Integer(1) ) )\n"
+      "        .add( age.eq( new Integer(2) ) )\n"
+      "    ) )\n"
+      "    .add( Property.forName(\"name\").in( new String[] { \"Fritz\", =
\"Izi\", \"Pk\" } ) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:92
+#, no-c-format
 msgid "Ordering the results"
 msgstr ""
 =

-#: query_criteria.xml:101(para) =

+#. Tag: para
+#: query_criteria.xml:94
+#, no-c-format
 msgid "You may order the results using <literal>org.hibernate.criterion.Or=
der</literal>."
 msgstr ""
 =

-#: query_criteria.xml:122(title) =

+#. Tag: programlisting
+#: query_criteria.xml:98
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.like(\"name\", \"F%\")\n"
+      "    .addOrder( Order.asc(\"name\") )\n"
+      "    .addOrder( Order.desc(\"age\") )\n"
+      "    .setMaxResults(50)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:100
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Property.forName(\"name\").like(\"F%\") )\n"
+      "    .addOrder( Property.forName(\"name\").asc() )\n"
+      "    .addOrder( Property.forName(\"age\").desc() )\n"
+      "    .setMaxResults(50)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:105
+#, no-c-format
 msgid "Associations"
 msgstr ""
 =

-#: query_criteria.xml:124(para) =

+#. Tag: para
+#: query_criteria.xml:107
+#, no-c-format
 msgid "You may easily specify constraints upon related entities by navigat=
ing associations using <literal>createCriteria()</literal>."
 msgstr ""
 =

-#: query_criteria.xml:135(para) =

+#. Tag: programlisting
+#: query_criteria.xml:112
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.like(\"name\", \"F%\") )\n"
+      "    .createCriteria(\"kittens\")\n"
+      "        .add( Restrictions.like(\"name\", \"F%\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:114
+#, no-c-format
 msgid "note that the second <literal>createCriteria()</literal> returns a =
new instance of <literal>Criteria</literal>, which refers to the elements o=
f the <literal>kittens</literal> collection."
 msgstr ""
 =

-#: query_criteria.xml:141(para) =

+#. Tag: para
+#: query_criteria.xml:120
+#, no-c-format
 msgid "The following, alternate form is useful in certain circumstances."
 msgstr ""
 =

-#: query_criteria.xml:151(para) =

+#. Tag: programlisting
+#: query_criteria.xml:124
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .createAlias(\"kittens\", \"kt\")\n"
+      "    .createAlias(\"mate\", \"mt\")\n"
+      "    .add( Restrictions.eqProperty(\"kt.name\", \"mt.name\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:126
+#, no-c-format
 msgid "(<literal>createAlias()</literal> does not create a new instance of=
 <literal>Criteria</literal>.)"
 msgstr ""
 =

-#: query_criteria.xml:156(para) =

+#. Tag: para
+#: query_criteria.xml:131
+#, no-c-format
 msgid "Note that the kittens collections held by the <literal>Cat</literal=
> instances returned by the previous two queries are <emphasis>not</emphasi=
s> pre-filtered by the criteria! If you wish to retrieve just the kittens t=
hat match the criteria, you must use a <literal>ResultTransformer</literal>=
."
 msgstr ""
 =

-#: query_criteria.xml:178(title) =

+#. Tag: programlisting
+#: query_criteria.xml:138
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .createCriteria(\"kittens\", \"kt\")\n"
+      "        .add( Restrictions.eq(\"name\", \"F%\") )\n"
+      "    .setResultTransformer(Criteria.ALIAS_TO_ENTITY_MAP)\n"
+      "    .list();\n"
+      "Iterator iter =3D cats.iterator();\n"
+      "while ( iter.hasNext() ) {\n"
+      "    Map map =3D (Map) iter.next();\n"
+      "    Cat cat =3D (Cat) map.get(Criteria.ROOT_ALIAS);\n"
+      "    Cat kitten =3D (Cat) map.get(\"kt\");\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:143
+#, no-c-format
 msgid "Dynamic association fetching"
 msgstr ""
 =

-#: query_criteria.xml:180(para) =

+#. Tag: para
+#: query_criteria.xml:145
+#, no-c-format
 msgid "You may specify association fetching semantics at runtime using <li=
teral>setFetchMode()</literal>."
 msgstr ""
 =

-#: query_criteria.xml:191(para) =

+#. Tag: programlisting
+#: query_criteria.xml:150
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createCriteria(Cat.class)\n"
+      "    .add( Restrictions.like(\"name\", \"Fritz%\") )\n"
+      "    .setFetchMode(\"mate\", FetchMode.EAGER)\n"
+      "    .setFetchMode(\"kittens\", FetchMode.EAGER)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:152
+#, no-c-format
 msgid "This query will fetch both <literal>mate</literal> and <literal>kit=
tens</literal> by outer join. See <xref linkend=3D\"performance-fetching\"/=
> for more information."
 msgstr ""
 =

-#: query_criteria.xml:199(title) =

+#. Tag: title
+#: query_criteria.xml:160
+#, no-c-format
 msgid "Example queries"
 msgstr ""
 =

-#: query_criteria.xml:201(para) =

+#. Tag: para
+#: query_criteria.xml:162
+#, no-c-format
 msgid "The class <literal>org.hibernate.criterion.Example</literal> allows=
 you to construct a query criterion from a given instance."
 msgstr ""
 =

-#: query_criteria.xml:213(para) =

+#. Tag: programlisting
+#: query_criteria.xml:167
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D new Cat();\n"
+      "cat.setSex('F');\n"
+      "cat.setColor(Color.BLACK);\n"
+      "List results =3D session.createCriteria(Cat.class)\n"
+      "    .add( Example.create(cat) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:169
+#, no-c-format
 msgid "Version properties, identifiers and associations are ignored. By de=
fault, null valued properties are excluded."
 msgstr ""
 =

-#: query_criteria.xml:218(para) =

+#. Tag: para
+#: query_criteria.xml:174
+#, no-c-format
 msgid "You can adjust how the <literal>Example</literal> is applied."
 msgstr ""
 =

-#: query_criteria.xml:231(para) =

+#. Tag: programlisting
+#: query_criteria.xml:178
+#, no-c-format
+msgid ""
+      "<![CDATA[Example example =3D Example.create(cat)\n"
+      "    .excludeZeroes()           //exclude zero valued properties\n"
+      "    .excludeProperty(\"color\")  //exclude the property named \"col=
or\"\n"
+      "    .ignoreCase()              //perform case insensitive string co=
mparisons\n"
+      "    .enableLike();             //use like for string comparisons\n"
+      "List results =3D session.createCriteria(Cat.class)\n"
+      "    .add(example)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:180
+#, no-c-format
 msgid "You can even use examples to place criteria upon associated objects=
."
 msgstr ""
 =

-#: query_criteria.xml:244(title) =

+#. Tag: programlisting
+#: query_criteria.xml:184
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .add( Example.create(cat) )\n"
+      "    .createCriteria(\"mate\")\n"
+      "        .add( Example.create( cat.getMate() ) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:189
+#, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr ""
 =

-#: query_criteria.xml:245(para) =

+#. Tag: para
+#: query_criteria.xml:190
+#, no-c-format
 msgid "The class <literal>org.hibernate.criterion.Projections</literal> is=
 a factory for <literal>Projection</literal> instances. We apply a projecti=
on to a query by calling <literal>setProjection()</literal>."
 msgstr ""
 =

-#: query_criteria.xml:265(para) =

+#. Tag: programlisting
+#: query_criteria.xml:196
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.rowCount() )\n"
+      "    .add( Restrictions.eq(\"color\", Color.BLACK) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:198
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.projectionList()\n"
+      "        .add( Projections.rowCount() )\n"
+      "        .add( Projections.avg(\"weight\") )\n"
+      "        .add( Projections.max(\"weight\") )\n"
+      "        .add( Projections.groupProperty(\"color\") )\n"
+      "    )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:200
+#, no-c-format
 msgid "There is no explicit \"group by\" necessary in a criteria query. Ce=
rtain projection types are defined to be <emphasis>grouping projections</em=
phasis>, which also appear in the SQL <literal>group by</literal> clause."
 msgstr ""
 =

-#: query_criteria.xml:271(para) =

+#. Tag: para
+#: query_criteria.xml:206
+#, no-c-format
 msgid "An alias may optionally be assigned to a projection, so that the pr=
ojected value may be referred to in restrictions or orderings. Here are two=
 different ways to do this:"
 msgstr ""
 =

-#: query_criteria.xml:287(para) =

+#. Tag: programlisting
+#: query_criteria.xml:212
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.alias( Projections.groupProperty(\"=
color\"), \"colr\" ) )\n"
+      "    .addOrder( Order.asc(\"colr\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:214
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.groupProperty(\"color\").as(\"colr\=
") )\n"
+      "    .addOrder( Order.asc(\"colr\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:216
+#, no-c-format
 msgid "The <literal>alias()</literal> and <literal>as()</literal> methods =
simply wrap a projection instance in another, aliased, instance of <literal=
>Projection</literal>. As a shortcut, you can assign an alias when you add =
the projection to a projection list:"
 msgstr ""
 =

-#: query_criteria.xml:315(para) =

+#. Tag: programlisting
+#: query_criteria.xml:223
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.projectionList()\n"
+      "        .add( Projections.rowCount(), \"catCountByColor\" )\n"
+      "        .add( Projections.avg(\"weight\"), \"avgWeight\" )\n"
+      "        .add( Projections.max(\"weight\"), \"maxWeight\" )\n"
+      "        .add( Projections.groupProperty(\"color\"), \"color\" )\n"
+      "    )\n"
+      "    .addOrder( Order.desc(\"catCountByColor\") )\n"
+      "    .addOrder( Order.desc(\"avgWeight\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:225
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Domestic.class, \"=
cat\")\n"
+      "    .createAlias(\"kittens\", \"kit\")\n"
+      "    .setProjection( Projections.projectionList()\n"
+      "        .add( Projections.property(\"cat.name\"), \"catName\" )\n"
+      "        .add( Projections.property(\"kit.name\"), \"kitName\" )\n"
+      "    )\n"
+      "    .addOrder( Order.asc(\"catName\") )\n"
+      "    .addOrder( Order.asc(\"kitName\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:227
+#, no-c-format
 msgid "You can also use <literal>Property.forName()</literal> to express p=
rojections:"
 msgstr ""
 =

-#: query_criteria.xml:338(title) =

+#. Tag: programlisting
+#: query_criteria.xml:231
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Property.forName(\"name\") )\n"
+      "    .add( Property.forName(\"color\").eq(Color.BLACK) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:233
+#, no-c-format
+msgid ""
+      "<![CDATA[List results =3D session.createCriteria(Cat.class)\n"
+      "    .setProjection( Projections.projectionList()\n"
+      "        .add( Projections.rowCount().as(\"catCountByColor\") )\n"
+      "        .add( Property.forName(\"weight\").avg().as(\"avgWeight\") =
)\n"
+      "        .add( Property.forName(\"weight\").max().as(\"maxWeight\") =
)\n"
+      "        .add( Property.forName(\"color\").group().as(\"color\" )\n"
+      "    )\n"
+      "    .addOrder( Order.desc(\"catCountByColor\") )\n"
+      "    .addOrder( Order.desc(\"avgWeight\") )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:238
+#, no-c-format
 msgid "Detached queries and subqueries"
 msgstr ""
 =

-#: query_criteria.xml:339(para) =

+#. Tag: para
+#: query_criteria.xml:239
+#, no-c-format
 msgid "The <literal>DetachedCriteria</literal> class lets you create a que=
ry outside the scope of a session, and then later execute it using some arb=
itrary <literal>Session</literal>."
 msgstr ""
 =

-#: query_criteria.xml:353(para) =

+#. Tag: programlisting
+#: query_criteria.xml:244
+#, no-c-format
+msgid ""
+      "<![CDATA[DetachedCriteria query =3D DetachedCriteria.forClass(Cat.c=
lass)\n"
+      "    .add( Property.forName(\"sex\").eq('F') );\n"
+      "    \n"
+      "Session session =3D ....;\n"
+      "Transaction txn =3D session.beginTransaction();\n"
+      "List results =3D query.getExecutableCriteria(session).setMaxResults=
(100).list();\n"
+      "txn.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:246
+#, no-c-format
 msgid "A <literal>DetachedCriteria</literal> may also be used to express a=
 subquery. Criterion instances involving subqueries may be obtained via <li=
teral>Subqueries</literal> or <literal>Property</literal>."
 msgstr ""
 =

-#: query_criteria.xml:371(para) =

+#. Tag: programlisting
+#: query_criteria.xml:252
+#, no-c-format
+msgid ""
+      "<![CDATA[DetachedCriteria avgWeight =3D DetachedCriteria.forClass(C=
at.class)\n"
+      "    .setProjection( Property.forName(\"weight\").avg() );\n"
+      "session.createCriteria(Cat.class)\n"
+      "    .add( Property.forName(\"weight\").gt(avgWeight) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_criteria.xml:254
+#, no-c-format
+msgid ""
+      "<![CDATA[DetachedCriteria weights =3D DetachedCriteria.forClass(Cat=
.class)\n"
+      "    .setProjection( Property.forName(\"weight\") );\n"
+      "session.createCriteria(Cat.class)\n"
+      "    .add( Subqueries.geAll(\"weight\", weights) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:256
+#, no-c-format
 msgid "Even correlated subqueries are possible:"
 msgstr ""
 =

-#: query_criteria.xml:389(title) =

+#. Tag: programlisting
+#: query_criteria.xml:260
+#, no-c-format
+msgid ""
+      "<![CDATA[DetachedCriteria avgWeightForSex =3D DetachedCriteria.forC=
lass(Cat.class, \"cat2\")\n"
+      "    .setProjection( Property.forName(\"weight\").avg() )\n"
+      "    .add( Property.forName(\"cat2.sex\").eqProperty(\"cat.sex\") );=
\n"
+      "session.createCriteria(Cat.class, \"cat\")\n"
+      "    .add( Property.forName(\"weight\").gt(avgWeightForSex) )\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_criteria.xml:269
+#, no-c-format
 msgid "Queries by natural identifier"
 msgstr ""
 =

-#: query_criteria.xml:391(para) =

+#. Tag: para
+#: query_criteria.xml:271
+#, no-c-format
 msgid "For most queries, including criteria queries, the query cache is no=
t very efficient, because query cache invalidation occurs too frequently. H=
owever, there is one special kind of query where we can optimize the cache =
invalidation algorithm: lookups by a constant natural key. In some applicat=
ions, this kind of query occurs frequently. The criteria API provides speci=
al provision for this use case."
 msgstr ""
 =

-#: query_criteria.xml:399(para) =

+#. Tag: para
+#: query_criteria.xml:279
+#, no-c-format
 msgid "First, you should map the natural key of your entity using <literal=
>&lt;natural-id&gt;</literal>, and enable use of the second-level cache."
 msgstr ""
 =

-#: query_criteria.xml:416(para) =

+#. Tag: programlisting
+#: query_criteria.xml:284
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"User\">\n"
+      "    <cache usage=3D\"read-write\"/>\n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"increment\"/>\n"
+      "    </id>\n"
+      "    <natural-id>\n"
+      "        <property name=3D\"name\"/>\n"
+      "        <property name=3D\"org\"/>\n"
+      "    </natural-id>\n"
+      "    <property name=3D\"password\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_criteria.xml:286
+#, no-c-format
 msgid "Note that this functionality is not intended for use with entities =
with <emphasis>mutable</emphasis> natural keys."
 msgstr ""
 =

-#: query_criteria.xml:421(para) =

+#. Tag: para
+#: query_criteria.xml:291
+#, no-c-format
 msgid "Next, enable the Hibernate query cache."
 msgstr ""
 =

-#: query_criteria.xml:425(para) =

+#. Tag: para
+#: query_criteria.xml:295
+#, no-c-format
 msgid "Now, <literal>Restrictions.naturalId()</literal> allows us to make =
use of the more efficient cache algorithm."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: query_criteria.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: query_criteria.xml:300
+#, no-c-format
+msgid ""
+      "<![CDATA[session.createCriteria(User.class)\n"
+      "    .add( Restrictions.naturalId()\n"
+      "        .set(\"name\", \"gavin\")\n"
+      "        .set(\"org\", \"hb\") \n"
+      "    ).setCacheable(true)\n"
+      "    .uniqueResult();]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/quer=
y_hql.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.=
pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.=
pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,644 +1,1793 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:34-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: query_hql.xml:5(title) =

+#. Tag: title
+#: query_hql.xml:29
+#, no-c-format
 msgid "HQL: The Hibernate Query Language"
 msgstr ""
 =

-#: query_hql.xml:7(para) =

+#. Tag: para
+#: query_hql.xml:31
+#, no-c-format
 msgid "Hibernate is equipped with an extremely powerful query language tha=
t (quite intentionally) looks very much like SQL. But don't be fooled by th=
e syntax; HQL is fully object-oriented, understanding notions like inherite=
nce, polymorphism and association."
 msgstr ""
 =

-#: query_hql.xml:14(title) =

+#. Tag: title
+#: query_hql.xml:38
+#, no-c-format
 msgid "Case Sensitivity"
 msgstr ""
 =

-#: query_hql.xml:16(para) =

+#. Tag: para
+#: query_hql.xml:40
+#, no-c-format
 msgid "Queries are case-insensitive, except for names of Java classes and =
properties. So <literal>SeLeCT</literal> is the same as <literal>sELEct</li=
teral> is the same as <literal>SELECT</literal> but <literal>org.hibernate.=
eg.FOO</literal> is not <literal>org.hibernate.eg.Foo</literal> and <litera=
l>foo.barSet</literal> is not <literal>foo.BARSET</literal>."
 msgstr ""
 =

-#: query_hql.xml:27(para) =

+#. Tag: para
+#: query_hql.xml:51
+#, no-c-format
 msgid "This manual uses lowercase HQL keywords. Some users find queries wi=
th uppercase keywords more readable, but we find this convention ugly when =
embedded in Java code."
 msgstr ""
 =

-#: query_hql.xml:35(title) =

+#. Tag: title
+#: query_hql.xml:59
+#, no-c-format
 msgid "The from clause"
 msgstr ""
 =

-#: query_hql.xml:37(para) =

+#. Tag: para
+#: query_hql.xml:61
+#, no-c-format
 msgid "The simplest possible Hibernate query is of the form:"
 msgstr ""
 =

-#: query_hql.xml:43(para) =

+#. Tag: programlisting
+#: query_hql.xml:65
+#, no-c-format
+msgid "<![CDATA[from eg.Cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:67
+#, no-c-format
 msgid "which simply returns all instances of the class <literal>eg.Cat</li=
teral>. We don't usually need to qualify the class name, since <literal>aut=
o-import</literal> is the default. So we almost always just write:"
 msgstr ""
 =

-#: query_hql.xml:51(para) =

+#. Tag: programlisting
+#: query_hql.xml:73
+#, no-c-format
+msgid "<![CDATA[from Cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:75
+#, no-c-format
 msgid "Most of the time, you will need to assign an <emphasis>alias</empha=
sis>, since you will want to refer to the <literal>Cat</literal> in other p=
arts of the query."
 msgstr ""
 =

-#: query_hql.xml:59(para) =

+#. Tag: programlisting
+#: query_hql.xml:81 query_hql.xml:396
+#, no-c-format
+msgid "<![CDATA[from Cat as cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:83
+#, no-c-format
 msgid "This query assigns the alias <literal>cat</literal> to <literal>Cat=
</literal> instances, so we could use that alias later in the query. The <l=
iteral>as</literal> keyword is optional; we could also write:"
 msgstr ""
 =

-#: query_hql.xml:67(para) =

+#. Tag: programlisting
+#: query_hql.xml:89
+#, no-c-format
+msgid "<![CDATA[from Cat cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:91
+#, no-c-format
 msgid "Multiple classes may appear, resulting in a cartesian product or \"=
cross\" join."
 msgstr ""
 =

-#: query_hql.xml:74(para) =

+#. Tag: programlisting
+#: query_hql.xml:95
+#, no-c-format
+msgid "<![CDATA[from Formula, Parameter]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:96
+#, no-c-format
+msgid "<![CDATA[from Formula as form, Parameter as param]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:98
+#, no-c-format
 msgid "It is considered good practice to name query aliases using an initi=
al lowercase, consistent with Java naming standards for local variables (eg=
. <literal>domesticCat</literal>)."
 msgstr ""
 =

-#: query_hql.xml:83(title) =

+#. Tag: title
+#: query_hql.xml:107
+#, no-c-format
 msgid "Associations and joins"
 msgstr ""
 =

-#: query_hql.xml:85(para) =

+#. Tag: para
+#: query_hql.xml:109
+#, no-c-format
 msgid "We may also assign aliases to associated entities, or even to eleme=
nts of a collection of values, using a <literal>join</literal>."
 msgstr ""
 =

-#: query_hql.xml:98(para) =

+#. Tag: programlisting
+#: query_hql.xml:114
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "    inner join cat.mate as mate\n"
+      "    left outer join cat.kittens as kitten]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:116
+#, no-c-format
+msgid "<![CDATA[from Cat as cat left join cat.mate.kittens as kittens]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:118
+#, no-c-format
+msgid "<![CDATA[from Formula form full join form.parameter param]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:120
+#, no-c-format
 msgid "The supported join types are borrowed from ANSI SQL"
 msgstr ""
 =

-#: query_hql.xml:105(literal) =

+#. Tag: literal
+#: query_hql.xml:127
+#, no-c-format
 msgid "inner join"
 msgstr ""
 =

-#: query_hql.xml:110(literal) =

+#. Tag: literal
+#: query_hql.xml:132
+#, no-c-format
 msgid "left outer join"
 msgstr ""
 =

-#: query_hql.xml:115(literal) =

+#. Tag: literal
+#: query_hql.xml:137
+#, no-c-format
 msgid "right outer join"
 msgstr ""
 =

-#: query_hql.xml:119(para) =

+#. Tag: para
+#: query_hql.xml:141
+#, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr ""
 =

-#: query_hql.xml:125(para) =

+#. Tag: para
+#: query_hql.xml:147
+#, no-c-format
 msgid "The <literal>inner join</literal>, <literal>left outer join</litera=
l> and <literal>right outer join</literal> constructs may be abbreviated."
 msgstr ""
 =

-#: query_hql.xml:134(para) =

+#. Tag: programlisting
+#: query_hql.xml:152
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "    join cat.mate as mate\n"
+      "    left join cat.kittens as kitten]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:154
+#, no-c-format
 msgid "You may supply extra join conditions using the HQL <literal>with</l=
iteral> keyword."
 msgstr ""
 =

-#: query_hql.xml:143(para) =

+#. Tag: programlisting
+#: query_hql.xml:159
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "    left join cat.kittens as kitten\n"
+      "        with kitten.bodyWeight > 10.0]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:161
+#, no-c-format
 msgid "In addition, a \"fetch\" join allows associations or collections of=
 values to be initialized along with their parent objects, using a single s=
elect. This is particularly useful in the case of a collection. It effectiv=
ely overrides the outer join and lazy declarations of the mapping file for =
associations and collections. See <xref linkend=3D\"performance-fetching\"/=
> for more information."
 msgstr ""
 =

-#: query_hql.xml:155(para) =

+#. Tag: programlisting
+#: query_hql.xml:169
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "    inner join fetch cat.mate\n"
+      "    left join fetch cat.kittens]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:171
+#, no-c-format
 msgid "A fetch join does not usually need to assign an alias, because the =
associated objects should not be used in the <literal>where</literal> claus=
e (or any other clause). Also, the associated objects are not returned dire=
ctly in the query results. Instead, they may be accessed via the parent obj=
ect. The only reason we might need an alias is if we are recursively join f=
etching a further collection:"
 msgstr ""
 =

-#: query_hql.xml:168(para) =

+#. Tag: programlisting
+#: query_hql.xml:179
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "    inner join fetch cat.mate\n"
+      "    left join fetch cat.kittens child\n"
+      "    left join fetch child.kittens]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:181
+#, no-c-format
 msgid "Note that the <literal>fetch</literal> construct may not be used in=
 queries called using <literal>iterate()</literal> (though <literal>scroll(=
)</literal> can be used). Nor should <literal>fetch</literal> be used toget=
her with <literal>setMaxResults()</literal> or <literal>setFirstResult()</l=
iteral> as these operations are based on the result rows, which usually con=
tain duplicates for eager collection fetching, hence, the number of rows is=
 not what you'd expect. Nor may <literal>fetch</literal> be used together w=
ith an ad hoc <literal>with</literal> condition. It is possible to create a=
 cartesian product by join fetching more than one collection in a query, so=
 take care in this case. Join fetching multiple collection roles also somet=
imes gives unexpected results for bag mappings, so be careful about how you=
 formulate your queries in this case. Finally, note that <literal>full join=
 fetch</literal> and <literal>right join fetch</literal> are not meaningful=
."
 msgstr ""
 =

-#: query_hql.xml:183(para) =

+#. Tag: para
+#: query_hql.xml:196
+#, no-c-format
 msgid "If you are using property-level lazy fetching (with bytecode instru=
mentation), it is possible to force Hibernate to fetch the lazy properties =
immediately (in the first query) using <literal>fetch all properties</liter=
al>."
 msgstr ""
 =

-#: query_hql.xml:195(title) =

+#. Tag: programlisting
+#: query_hql.xml:202
+#, no-c-format
+msgid "<![CDATA[from Document fetch all properties order by name]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:203
+#, no-c-format
+msgid "<![CDATA[from Document doc fetch all properties where lower(doc.nam=
e) like '%cats%']]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:208
+#, no-c-format
 msgid "Forms of join syntax"
 msgstr ""
 =

-#: query_hql.xml:197(para) =

+#. Tag: para
+#: query_hql.xml:210
+#, no-c-format
 msgid "HQL supports two forms of association joining: <literal>implicit</l=
iteral> and <literal>explicit</literal>."
 msgstr ""
 =

-#: query_hql.xml:201(para) =

+#. Tag: para
+#: query_hql.xml:214
+#, no-c-format
 msgid "The queries shown in the previous section all use the <literal>expl=
icit</literal> form where the join keyword is explicitly used in the from c=
lause. This is the recommended form."
 msgstr ""
 =

-#: query_hql.xml:206(para) =

+#. Tag: para
+#: query_hql.xml:219
+#, no-c-format
 msgid "The <literal>implicit</literal> form does not use the join keyword.=
 Instead, the associations are \"dereferenced\" using dot-notation. <litera=
l>implicit</literal> joins can appear in any of the HQL clauses. <literal>i=
mplicit</literal> join result in inner joins in the resulting SQL statement=
."
 msgstr ""
 =

-#: query_hql.xml:217(title) =

+#. Tag: programlisting
+#: query_hql.xml:226
+#, no-c-format
+msgid "<![CDATA[from Cat as cat where cat.mate.name like '%s%']]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:230
+#, no-c-format
 msgid "Refering to identifier property"
 msgstr ""
 =

-#: query_hql.xml:219(para) =

+#. Tag: para
+#: query_hql.xml:232
+#, no-c-format
 msgid "There are, generally speaking, 2 ways to refer to an entity's ident=
ifier property:"
 msgstr ""
 =

-#: query_hql.xml:224(para) =

+#. Tag: para
+#: query_hql.xml:237
+#, no-c-format
 msgid "The special property (lowercase) <literal>id</literal> may be used =
to reference the identifier property of an entity <emphasis>provided that e=
ntity does not define a non-identifier property named id</emphasis>."
 msgstr ""
 =

-#: query_hql.xml:231(para) =

+#. Tag: para
+#: query_hql.xml:244
+#, no-c-format
 msgid "If the entity defines a named identifier property, you may use that=
 property name."
 msgstr ""
 =

-#: query_hql.xml:237(para) =

+#. Tag: para
+#: query_hql.xml:250
+#, no-c-format
 msgid "References to composite identifier properties follow the same namin=
g rules. If the entity has a non-identifier property named id, the composit=
e identifier property can only be referenced by its defined named; otherwis=
e, the special <literal>id</literal> property can be used to rerference the=
 identifier property."
 msgstr ""
 =

-#: query_hql.xml:244(para) =

-msgid "Note: this has changed significantly starting in version 3.2.2. In =
previous versions, <literal>id</literal><emphasis>always</emphasis> referre=
d to the identifier property no matter what its actual name. A ramification=
 of that decision was that non-identifier properties named <literal>id</lit=
eral> could never be referenced in Hibernate queries."
+#. Tag: para
+#: query_hql.xml:257
+#, no-c-format
+msgid "Note: this has changed significantly starting in version 3.2.2. In =
previous versions, <literal>id</literal> <emphasis>always</emphasis> referr=
ed to the identifier property no matter what its actual name. A ramificatio=
n of that decision was that non-identifier properties named <literal>id</li=
teral> could never be referenced in Hibernate queries."
 msgstr ""
 =

-#: query_hql.xml:253(title) =

+#. Tag: title
+#: query_hql.xml:266
+#, no-c-format
 msgid "The select clause"
 msgstr ""
 =

-#: query_hql.xml:255(para) =

+#. Tag: para
+#: query_hql.xml:268
+#, no-c-format
 msgid "The <literal>select</literal> clause picks which objects and proper=
ties to return in the query result set. Consider:"
 msgstr ""
 =

-#: query_hql.xml:264(para) =

+#. Tag: programlisting
+#: query_hql.xml:273
+#, no-c-format
+msgid ""
+      "<![CDATA[select mate\n"
+      "from Cat as cat\n"
+      "    inner join cat.mate as mate]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:275
+#, no-c-format
 msgid "The query will select <literal>mate</literal>s of other <literal>Ca=
t</literal>s. Actually, you may express this query more compactly as:"
 msgstr ""
 =

-#: query_hql.xml:271(para) =

+#. Tag: programlisting
+#: query_hql.xml:280
+#, no-c-format
+msgid "<![CDATA[select cat.mate from Cat cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:282
+#, no-c-format
 msgid "Queries may return properties of any value type including propertie=
s of component type:"
 msgstr ""
 =

-#: query_hql.xml:280(para) =

+#. Tag: programlisting
+#: query_hql.xml:286
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat.name from DomesticCat cat\n"
+      "where cat.name like 'fri%']]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:288
+#, no-c-format
+msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:290
+#, no-c-format
 msgid "Queries may return multiple objects and/or properties as an array o=
f type <literal>Object[]</literal>,"
 msgstr ""
 =

-#: query_hql.xml:290(para) =

+#. Tag: programlisting
+#: query_hql.xml:295
+#, no-c-format
+msgid ""
+      "<![CDATA[select mother, offspr, mate.name\n"
+      "from DomesticCat as mother\n"
+      "    inner join mother.mate as mate\n"
+      "    left outer join mother.kittens as offspr]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:297
+#, no-c-format
 msgid "or as a <literal>List</literal>,"
 msgstr ""
 =

-#: query_hql.xml:299(para) =

+#. Tag: programlisting
+#: query_hql.xml:301
+#, no-c-format
+msgid ""
+      "<![CDATA[select new list(mother, offspr, mate.name)\n"
+      "from DomesticCat as mother\n"
+      "    inner join mother.mate as mate\n"
+      "    left outer join mother.kittens as offspr]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:303
+#, no-c-format
 msgid "or as an actual typesafe Java object,"
 msgstr ""
 =

-#: query_hql.xml:308(para) =

+#. Tag: programlisting
+#: query_hql.xml:307
+#, no-c-format
+msgid ""
+      "<![CDATA[select new Family(mother, mate, offspr)\n"
+      "from DomesticCat as mother\n"
+      "    join mother.mate as mate\n"
+      "    left join mother.kittens as offspr]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:309
+#, no-c-format
 msgid "assuming that the class <literal>Family</literal> has an appropriat=
e constructor."
 msgstr ""
 =

-#: query_hql.xml:312(para) =

+#. Tag: para
+#: query_hql.xml:313
+#, no-c-format
 msgid "You may assign aliases to selected expressions using <literal>as</l=
iteral>:"
 msgstr ""
 =

-#: query_hql.xml:319(para) =

+#. Tag: programlisting
+#: query_hql.xml:317
+#, no-c-format
+msgid ""
+      "<![CDATA[select max(bodyWeight) as max, min(bodyWeight) as min, cou=
nt(*) as n\n"
+      "from Cat cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:319
+#, no-c-format
 msgid "This is most useful when used together with <literal>select new map=
</literal>:"
 msgstr ""
 =

-#: query_hql.xml:326(para) =

+#. Tag: programlisting
+#: query_hql.xml:323
+#, no-c-format
+msgid ""
+      "<![CDATA[select new map( max(bodyWeight) as max, min(bodyWeight) as=
 min, count(*) as n )\n"
+      "from Cat cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:325
+#, no-c-format
 msgid "This query returns a <literal>Map</literal> from aliases to selecte=
d values."
 msgstr ""
 =

-#: query_hql.xml:333(title) =

+#. Tag: title
+#: query_hql.xml:332
+#, no-c-format
 msgid "Aggregate functions"
 msgstr ""
 =

-#: query_hql.xml:335(para) =

+#. Tag: para
+#: query_hql.xml:334
+#, no-c-format
 msgid "HQL queries may even return the results of aggregate functions on p=
roperties:"
 msgstr ""
 =

-#. NO LONGER SUPPORTED
-#.         <para>
-#.             Collections may also appear inside aggregate functions in t=
he <literal>select</literal>
-#.             clause.
-#.         </para>
-#. =

-#.         <programlisting><![CDATA[select cat, count( elements(cat.kitten=
s) )
-#. from Cat cat group by cat]]></programlisting>
-#: query_hql.xml:352(para) =

+#. Tag: programlisting
+#: query_hql.xml:338
+#, no-c-format
+msgid ""
+      "<![CDATA[select avg(cat.weight), sum(cat.weight), max(cat.weight), =
count(cat)\n"
+      "from Cat cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:349
+#, no-c-format
 msgid "The supported aggregate functions are"
 msgstr ""
 =

-#: query_hql.xml:359(literal) =

+#. Tag: literal
+#: query_hql.xml:356
+#, no-c-format
 msgid "avg(...), sum(...), min(...), max(...)"
 msgstr ""
 =

-#: query_hql.xml:364(literal) =

+#. Tag: literal
+#: query_hql.xml:361
+#, no-c-format
 msgid "count(*)"
 msgstr ""
 =

-#: query_hql.xml:369(literal) =

+#. Tag: literal
+#: query_hql.xml:366
+#, no-c-format
 msgid "count(...), count(distinct ...), count(all...)"
 msgstr ""
 =

-#: query_hql.xml:374(para) =

+#. Tag: para
+#: query_hql.xml:371
+#, no-c-format
 msgid "You may use arithmetic operators, concatenation, and recognized SQL=
 functions in the select clause:"
 msgstr ""
 =

-#: query_hql.xml:386(para) =

+#. Tag: programlisting
+#: query_hql.xml:376
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat.weight + sum(kitten.weight)\n"
+      "from Cat cat\n"
+      "    join cat.kittens kitten\n"
+      "group by cat.id, cat.weight]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:378
+#, no-c-format
+msgid "<![CDATA[select firstName||' '||initial||' '||upper(lastName) from =
Person]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:380
+#, no-c-format
 msgid "The <literal>distinct</literal> and <literal>all</literal> keywords=
 may be used and have the same semantics as in SQL."
 msgstr ""
 =

-#: query_hql.xml:398(title) =

+#. Tag: programlisting
+#: query_hql.xml:385
+#, no-c-format
+msgid ""
+      "<![CDATA[select distinct cat.name from Cat cat\n"
+      "\n"
+      "select count(distinct cat.name), count(cat) from Cat cat]]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:390
+#, no-c-format
 msgid "Polymorphic queries"
 msgstr ""
 =

-#: query_hql.xml:400(para) =

+#. Tag: para
+#: query_hql.xml:392
+#, no-c-format
 msgid "A query like:"
 msgstr ""
 =

-#: query_hql.xml:406(para) =

+#. Tag: para
+#: query_hql.xml:398
+#, no-c-format
 msgid "returns instances not only of <literal>Cat</literal>, but also of s=
ubclasses like <literal>DomesticCat</literal>. Hibernate queries may name <=
emphasis>any</emphasis> Java class or interface in the <literal>from</liter=
al> clause. The query will return instances of all persistent classes that =
extend that class or implement the interface. The following query would ret=
urn all persistent objects:"
 msgstr ""
 =

-#: query_hql.xml:416(para) =

+#. Tag: programlisting
+#: query_hql.xml:406
+#, no-c-format
+msgid "<![CDATA[from java.lang.Object o]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:408
+#, no-c-format
 msgid "The interface <literal>Named</literal> might be implemented by vari=
ous persistent classes:"
 msgstr ""
 =

-#: query_hql.xml:423(para) =

+#. Tag: programlisting
+#: query_hql.xml:413
+#, no-c-format
+msgid "<![CDATA[from Named n, Named m where n.name =3D m.name]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:415
+#, no-c-format
 msgid "Note that these last two queries will require more than one SQL <li=
teral>SELECT</literal>. This means that the <literal>order by</literal> cla=
use does not correctly order the whole result set. (It also means you can't=
 call these queries using <literal>Query.scroll()</literal>.)"
 msgstr ""
 =

-#: query_hql.xml:432(title) =

+#. Tag: title
+#: query_hql.xml:424
+#, no-c-format
 msgid "The where clause"
 msgstr ""
 =

-#: query_hql.xml:434(para) =

+#. Tag: para
+#: query_hql.xml:426
+#, no-c-format
 msgid "The <literal>where</literal> clause allows you to narrow the list o=
f instances returned. If no alias exists, you may refer to properties by na=
me:"
 msgstr ""
 =

-#: query_hql.xml:441(para) =

+#. Tag: programlisting
+#: query_hql.xml:431
+#, no-c-format
+msgid "<![CDATA[from Cat where name=3D'Fritz']]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:433
+#, no-c-format
 msgid "If there is an alias, use a qualified property name:"
 msgstr ""
 =

-#: query_hql.xml:447(para) =

+#. Tag: programlisting
+#: query_hql.xml:437
+#, no-c-format
+msgid "<![CDATA[from Cat as cat where cat.name=3D'Fritz']]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:439
+#, no-c-format
 msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr ""
 =

-#: query_hql.xml:455(para) =

+#. Tag: programlisting
+#: query_hql.xml:443
+#, no-c-format
+msgid ""
+      "<![CDATA[select foo\n"
+      "from Foo foo, Bar bar\n"
+      "where foo.startDate =3D bar.date]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:445
+#, no-c-format
 msgid "will return all instances of <literal>Foo</literal> for which there=
 exists an instance of <literal>bar</literal> with a <literal>date</literal=
> property equal to the <literal>startDate</literal> property of the <liter=
al>Foo</literal>. Compound path expressions make the <literal>where</litera=
l> clause extremely powerful. Consider:"
 msgstr ""
 =

-#: query_hql.xml:466(para) =

+#. Tag: programlisting
+#: query_hql.xml:454
+#, no-c-format
+msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:456
+#, no-c-format
 msgid "This query translates to an SQL query with a table (inner) join. If=
 you were to write something like"
 msgstr ""
 =

-#: query_hql.xml:474(para) =

+#. Tag: programlisting
+#: query_hql.xml:461
+#, no-c-format
+msgid ""
+      "<![CDATA[from Foo foo\n"
+      "where foo.bar.baz.customer.address.city is not null]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:463
+#, no-c-format
 msgid "you would end up with a query that would require four table joins i=
n SQL."
 msgstr ""
 =

-#: query_hql.xml:478(para) =

+#. Tag: para
+#: query_hql.xml:467
+#, no-c-format
 msgid "The <literal>=3D</literal> operator may be used to compare not only=
 properties, but also instances:"
 msgstr ""
 =

-#: query_hql.xml:489(para) =

+#. Tag: programlisting
+#: query_hql.xml:472
+#, no-c-format
+msgid "<![CDATA[from Cat cat, Cat rival where cat.mate =3D rival.mate]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:474
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat, mate\n"
+      "from Cat cat, Cat mate\n"
+      "where cat.mate =3D mate]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:476
+#, no-c-format
 msgid "The special property (lowercase) <literal>id</literal> may be used =
to reference the unique identifier of an object. See <xref linkend=3D\"quer=
yhql-identifier-property\"/> for more information."
 msgstr ""
 =

-#: query_hql.xml:499(para) =

+#. Tag: programlisting
+#: query_hql.xml:482
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat where cat.id =3D 123\n"
+      "\n"
+      "from Cat as cat where cat.mate.id =3D 69]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:484
+#, no-c-format
 msgid "The second query is efficient. No table join is required!"
 msgstr ""
 =

-#: query_hql.xml:503(para) =

+#. Tag: para
+#: query_hql.xml:488
+#, no-c-format
 msgid "Properties of composite identifiers may also be used. Suppose <lite=
ral>Person</literal> has a composite identifier consisting of <literal>coun=
try</literal> and <literal>medicareNumber</literal>. Again, see <xref linke=
nd=3D\"queryhql-identifier-property\"/> for more information regarding refe=
rencing identifier properties."
 msgstr ""
 =

-#: query_hql.xml:518(para) =

+#. Tag: programlisting
+#: query_hql.xml:495
+#, no-c-format
+msgid ""
+      "<![CDATA[from bank.Person person\n"
+      "where person.id.country =3D 'AU'\n"
+      "    and person.id.medicareNumber =3D 123456]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:497
+#, no-c-format
+msgid ""
+      "<![CDATA[from bank.Account account\n"
+      "where account.owner.id.country =3D 'AU'\n"
+      "    and account.owner.id.medicareNumber =3D 123456]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:499
+#, no-c-format
 msgid "Once again, the second query requires no table join."
 msgstr ""
 =

-#: query_hql.xml:522(para) =

+#. Tag: para
+#: query_hql.xml:503
+#, no-c-format
 msgid "Likewise, the special property <literal>class</literal> accesses th=
e discriminator value of an instance in the case of polymorphic persistence=
. A Java class name embedded in the where clause will be translated to its =
discriminator value."
 msgstr ""
 =

-#: query_hql.xml:530(para) =

-msgid "You may also use components or composite user types, or properties =
of said component types. See <xref linkend=3D\"queryhql-coomponents\"/> for=
 more details."
+#. Tag: programlisting
+#: query_hql.xml:509
+#, no-c-format
+msgid "<![CDATA[from Cat cat where cat.class =3D DomesticCat]]>"
 msgstr ""
 =

-#: query_hql.xml:535(para) =

+#. Tag: para
+#: query_hql.xml:511
+#, no-c-format
+msgid "You may also use components or composite user types, or properties =
of said component types. See <xref linkend=3D\"queryhql-components\"/> for =
more details."
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:516
+#, no-c-format
 msgid "An \"any\" type has the special properties <literal>id</literal> an=
d <literal>class</literal>, allowing us to express a join in the following =
way (where <literal>AuditLog.item</literal> is a property mapped with <lite=
ral>&lt;any&gt;</literal>)."
 msgstr ""
 =

-#: query_hql.xml:544(para) =

+#. Tag: programlisting
+#: query_hql.xml:522
+#, no-c-format
+msgid ""
+      "<![CDATA[from AuditLog log, Payment payment\n"
+      "where log.item.class =3D 'Payment' and log.item.id =3D payment.id]]=
>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:524
+#, no-c-format
 msgid "Notice that <literal>log.item.class</literal> and <literal>payment.=
class</literal> would refer to the values of completely different database =
columns in the above query."
 msgstr ""
 =

-#: query_hql.xml:552(title) =

+#. Tag: title
+#: query_hql.xml:532
+#, no-c-format
 msgid "Expressions"
 msgstr ""
 =

-#: query_hql.xml:554(para) =

+#. Tag: para
+#: query_hql.xml:534
+#, no-c-format
 msgid "Expressions allowed in the <literal>where</literal> clause include =
most of the kind of things you could write in SQL:"
 msgstr ""
 =

-#: query_hql.xml:561(para) =

+#. Tag: para
+#: query_hql.xml:541
+#, no-c-format
 msgid "mathematical operators <literal>+, -, *, /</literal>"
 msgstr ""
 =

-#: query_hql.xml:566(para) =

+#. Tag: para
+#: query_hql.xml:546
+#, no-c-format
 msgid "binary comparison operators <literal>=3D, &gt;=3D, &lt;=3D, &lt;&gt=
;, !=3D, like</literal>"
 msgstr ""
 =

-#: query_hql.xml:571(para) =

+#. Tag: para
+#: query_hql.xml:551
+#, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr ""
 =

-#: query_hql.xml:576(para) =

+#. Tag: para
+#: query_hql.xml:556
+#, no-c-format
 msgid "Parentheses <literal>( )</literal>, indicating grouping"
 msgstr ""
 =

-#: query_hql.xml:581(para) =

+#. Tag: para
+#: query_hql.xml:561
+#, no-c-format
 msgid "<literal>in</literal>, <literal>not in</literal>, <literal>between<=
/literal>, <literal>is null</literal>, <literal>is not null</literal>, <lit=
eral>is empty</literal>, <literal>is not empty</literal>, <literal>member o=
f</literal> and <literal>not member of</literal>"
 msgstr ""
 =

-#: query_hql.xml:594(para) =

+#. Tag: para
+#: query_hql.xml:574
+#, no-c-format
 msgid "\"Simple\" case, <literal>case ... when ... then ... else ... end</=
literal>, and \"searched\" case, <literal>case when ... then ... else ... e=
nd</literal>"
 msgstr ""
 =

-#: query_hql.xml:600(para) =

+#. Tag: para
+#: query_hql.xml:580
+#, no-c-format
 msgid "string concatenation <literal>...||...</literal> or <literal>concat=
(...,...)</literal>"
 msgstr ""
 =

-#: query_hql.xml:605(para) =

+#. Tag: para
+#: query_hql.xml:585
+#, no-c-format
 msgid "<literal>current_date()</literal>, <literal>current_time()</literal=
>, <literal>current_timestamp()</literal>"
 msgstr ""
 =

-#: query_hql.xml:611(para) =

+#. Tag: para
+#: query_hql.xml:591
+#, no-c-format
 msgid "<literal>second(...)</literal>, <literal>minute(...)</literal>, <li=
teral>hour(...)</literal>, <literal>day(...)</literal>, <literal>month(...)=
</literal>, <literal>year(...)</literal>,"
 msgstr ""
 =

-#: query_hql.xml:618(para) =

+#. Tag: para
+#: query_hql.xml:598
+#, no-c-format
 msgid "Any function or operator defined by EJB-QL 3.0: <literal>substring(=
), trim(), lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(=
), mod()</literal>"
 msgstr ""
 =

-#: query_hql.xml:624(para) =

+#. Tag: para
+#: query_hql.xml:604
+#, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr ""
 =

-#: query_hql.xml:629(para) =

+#. Tag: para
+#: query_hql.xml:609
+#, no-c-format
 msgid "<literal>str()</literal> for converting numeric or temporal values =
to a readable string"
 msgstr ""
 =

-#: query_hql.xml:635(para) =

+#. Tag: para
+#: query_hql.xml:615
+#, no-c-format
 msgid "<literal>cast(... as ...)</literal>, where the second argument is t=
he name of a Hibernate type, and <literal>extract(... from ...)</literal> i=
f ANSI <literal>cast()</literal> and <literal>extract()</literal> is suppor=
ted by the underlying database"
 msgstr ""
 =

-#: query_hql.xml:643(para) =

+#. Tag: para
+#: query_hql.xml:623
+#, no-c-format
 msgid "the HQL <literal>index()</literal> function, that applies to aliase=
s of a joined indexed collection"
 msgstr ""
 =

-#: query_hql.xml:649(para) =

+#. Tag: para
+#: query_hql.xml:629
+#, no-c-format
 msgid "HQL functions that take collection-valued path expressions: <litera=
l>size(), minelement(), maxelement(), minindex(), maxindex()</literal>, alo=
ng with the special <literal>elements()</literal> and <literal>indices</lit=
eral> functions which may be quantified using <literal>some, all, exists, a=
ny, in</literal>."
 msgstr ""
 =

-#: query_hql.xml:657(para) =

+#. Tag: para
+#: query_hql.xml:637
+#, no-c-format
 msgid "Any database-supported SQL scalar function like <literal>sign()</li=
teral>, <literal>trunc()</literal>, <literal>rtrim()</literal>, <literal>si=
n()</literal>"
 msgstr ""
 =

-#: query_hql.xml:663(para) =

+#. Tag: para
+#: query_hql.xml:643
+#, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr ""
 =

-#: query_hql.xml:668(para) =

+#. Tag: para
+#: query_hql.xml:648
+#, no-c-format
 msgid "named parameters <literal>:name</literal>, <literal>:start_date</li=
teral>, <literal>:x1</literal>"
 msgstr ""
 =

-#: query_hql.xml:673(para) =

+#. Tag: para
+#: query_hql.xml:653
+#, no-c-format
 msgid "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <lite=
ral>6.66E+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 msgstr ""
 =

-#: query_hql.xml:679(para) =

+#. Tag: para
+#: query_hql.xml:659
+#, no-c-format
 msgid "Java <literal>public static final</literal> constants <literal>eg.C=
olor.TABBY</literal>"
 msgstr ""
 =

-#: query_hql.xml:685(para) =

+#. Tag: para
+#: query_hql.xml:665
+#, no-c-format
 msgid "<literal>in</literal> and <literal>between</literal> may be used as=
 follows:"
 msgstr ""
 =

-#: query_hql.xml:693(para) =

+#. Tag: programlisting
+#: query_hql.xml:669
+#, no-c-format
+msgid "<![CDATA[from DomesticCat cat where cat.name between 'A' and 'B']]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:671
+#, no-c-format
+msgid "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Ba=
z' )]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:673
+#, no-c-format
 msgid "and the negated forms may be written"
 msgstr ""
 =

-#: query_hql.xml:701(para) =

+#. Tag: programlisting
+#: query_hql.xml:677
+#, no-c-format
+msgid "<![CDATA[from DomesticCat cat where cat.name not between 'A' and 'B=
']]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:679
+#, no-c-format
+msgid "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar',=
 'Baz' )]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:681
+#, no-c-format
 msgid "Likewise, <literal>is null</literal> and <literal>is not null</lite=
ral> may be used to test for null values."
 msgstr ""
 =

-#: query_hql.xml:706(para) =

+#. Tag: para
+#: query_hql.xml:686
+#, no-c-format
 msgid "Booleans may be easily used in expressions by declaring HQL query s=
ubstitutions in Hibernate configuration:"
 msgstr ""
 =

-#: query_hql.xml:713(para) =

+#. Tag: programlisting
+#: query_hql.xml:691
+#, no-c-format
+msgid "<![CDATA[<property name=3D\"hibernate.query.substitutions\">true 1,=
 false 0</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:693
+#, no-c-format
 msgid "This will replace the keywords <literal>true</literal> and <literal=
>false</literal> with the literals <literal>1</literal> and <literal>0</lit=
eral> in the translated SQL from this HQL:"
 msgstr ""
 =

-#: query_hql.xml:720(para) =

+#. Tag: programlisting
+#: query_hql.xml:698
+#, no-c-format
+msgid "<![CDATA[from Cat cat where cat.alive =3D true]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:700
+#, no-c-format
 msgid "You may test the size of a collection with the special property <li=
teral>size</literal>, or the special <literal>size()</literal> function."
 msgstr ""
 =

-#: query_hql.xml:729(para) =

+#. Tag: programlisting
+#: query_hql.xml:705
+#, no-c-format
+msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:707
+#, no-c-format
+msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:709
+#, no-c-format
 msgid "For indexed collections, you may refer to the minimum and maximum i=
ndices using <literal>minindex</literal> and <literal>maxindex</literal> fu=
nctions. Similarly, you may refer to the minimum and maximum elements of a =
collection of basic type using the <literal>minelement</literal> and <liter=
al>maxelement</literal> functions."
 msgstr ""
 =

-#: query_hql.xml:743(para) =

+#. Tag: programlisting
+#: query_hql.xml:717
+#, no-c-format
+msgid "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current=
_date]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:719
+#, no-c-format
+msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:721
+#, no-c-format
+msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:723
+#, no-c-format
 msgid "The SQL functions <literal>any, some, all, exists, in</literal> are=
 supported when passed the element or index set of a collection (<literal>e=
lements</literal> and <literal>indices</literal> functions) or the result o=
f a subquery (see below)."
 msgstr ""
 =

-#: query_hql.xml:761(para) =

+#. Tag: programlisting
+#: query_hql.xml:729
+#, no-c-format
+msgid ""
+      "<![CDATA[select mother from Cat as mother, Cat as kit\n"
+      "where kit in elements(foo.kittens)]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:731
+#, no-c-format
+msgid ""
+      "<![CDATA[select p from NameList list, Person p\n"
+      "where p.name =3D some elements(list.names)]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:733
+#, no-c-format
+msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:735
+#, no-c-format
+msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:737
+#, no-c-format
+msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:739
+#, no-c-format
 msgid "Note that these constructs - <literal>size</literal>, <literal>elem=
ents</literal>, <literal>indices</literal>, <literal>minindex</literal>, <l=
iteral>maxindex</literal>, <literal>minelement</literal>, <literal>maxeleme=
nt</literal> - may only be used in the where clause in Hibernate3."
 msgstr ""
 =

-#: query_hql.xml:768(para) =

+#. Tag: para
+#: query_hql.xml:746
+#, no-c-format
 msgid "Elements of indexed collections (arrays, lists, maps) may be referr=
ed to by index (in a where clause only):"
 msgstr ""
 =

-#: query_hql.xml:785(para) =

+#. Tag: programlisting
+#: query_hql.xml:751
+#, no-c-format
+msgid "<![CDATA[from Order order where order.items[0].id =3D 1234]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:753
+#, no-c-format
+msgid ""
+      "<![CDATA[select person from Person person, Calendar calendar\n"
+      "where calendar.holidays['national day'] =3D person.birthDay\n"
+      "    and person.nationality.calendar =3D calendar]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:755
+#, no-c-format
+msgid ""
+      "<![CDATA[select item from Item item, Order order\n"
+      "where order.items[ order.deliveredItemIndices[0] ] =3D item and ord=
er.id =3D 11]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:757
+#, no-c-format
+msgid ""
+      "<![CDATA[select item from Item item, Order order\n"
+      "where order.items[ maxindex(order.items) ] =3D item and order.id =
=3D 11]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:759
+#, no-c-format
 msgid "The expression inside <literal>[]</literal> may even be an arithmet=
ic expression."
 msgstr ""
 =

-#: query_hql.xml:792(para) =

+#. Tag: programlisting
+#: query_hql.xml:763
+#, no-c-format
+msgid ""
+      "<![CDATA[select item from Item item, Order order\n"
+      "where order.items[ size(order.items) - 1 ] =3D item]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:765
+#, no-c-format
 msgid "HQL also provides the built-in <literal>index()</literal> function,=
 for elements of a one-to-many association or collection of values."
 msgstr ""
 =

-#: query_hql.xml:801(para) =

+#. Tag: programlisting
+#: query_hql.xml:770
+#, no-c-format
+msgid ""
+      "<![CDATA[select item, index(item) from Order order\n"
+      "    join order.items item\n"
+      "where index(item) < 5]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:772
+#, no-c-format
 msgid "Scalar SQL functions supported by the underlying database may be us=
ed"
 msgstr ""
 =

-#: query_hql.xml:807(para) =

+#. Tag: programlisting
+#: query_hql.xml:776
+#, no-c-format
+msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:778
+#, no-c-format
 msgid "If you are not yet convinced by all this, think how much longer and=
 less readable the following query would be in SQL:"
 msgstr ""
 =

-#: query_hql.xml:820(para) =

+#. Tag: programlisting
+#: query_hql.xml:783
+#, no-c-format
+msgid ""
+      "<![CDATA[select cust\n"
+      "from Product prod,\n"
+      "    Store store\n"
+      "    inner join store.customers cust\n"
+      "where prod.name =3D 'widget'\n"
+      "    and store.location.name in ( 'Melbourne', 'Sydney' )\n"
+      "    and prod =3D all elements(cust.currentOrder.lineItems)]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:785
+#, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr ""
 =

-#: query_hql.xml:845(title) =

+#. Tag: programlisting
+#: query_hql.xml:789
+#, no-c-format
+msgid ""
+      "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust.=
current_order\n"
+      "FROM customers cust,\n"
+      "    stores store,\n"
+      "    locations loc,\n"
+      "    store_customers sc,\n"
+      "    product prod\n"
+      "WHERE prod.name =3D 'widget'\n"
+      "    AND store.loc_id =3D loc.id\n"
+      "    AND loc.name IN ( 'Melbourne', 'Sydney' )\n"
+      "    AND sc.store_id =3D store.id\n"
+      "    AND sc.cust_id =3D cust.id\n"
+      "    AND prod.id =3D ALL(\n"
+      "        SELECT item.prod_id\n"
+      "        FROM line_items item, orders o\n"
+      "        WHERE item.order_id =3D o.id\n"
+      "            AND cust.current_order =3D o.id\n"
+      "    )]]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:794
+#, no-c-format
 msgid "The order by clause"
 msgstr ""
 =

-#: query_hql.xml:847(para) =

+#. Tag: para
+#: query_hql.xml:796
+#, no-c-format
 msgid "The list returned by a query may be ordered by any property of a re=
turned class or components:"
 msgstr ""
 =

-#: query_hql.xml:854(para) =

+#. Tag: programlisting
+#: query_hql.xml:800
+#, no-c-format
+msgid ""
+      "<![CDATA[from DomesticCat cat\n"
+      "order by cat.name asc, cat.weight desc, cat.birthdate]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:802
+#, no-c-format
 msgid "The optional <literal>asc</literal> or <literal>desc</literal> indi=
cate ascending or descending order respectively."
 msgstr ""
 =

-#: query_hql.xml:861(title) =

+#. Tag: title
+#: query_hql.xml:809
+#, no-c-format
 msgid "The group by clause"
 msgstr ""
 =

-#: query_hql.xml:863(para) =

+#. Tag: para
+#: query_hql.xml:811
+#, no-c-format
 msgid "A query that returns aggregate values may be grouped by any propert=
y of a returned class or components:"
 msgstr ""
 =

-#: query_hql.xml:875(para) =

+#. Tag: programlisting
+#: query_hql.xml:815
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
+      "from Cat cat\n"
+      "group by cat.color]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:817
+#, no-c-format
+msgid ""
+      "<![CDATA[select foo.id, avg(name), max(name)\n"
+      "from Foo foo join foo.names name\n"
+      "group by foo.id]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:819
+#, no-c-format
 msgid "A <literal>having</literal> clause is also allowed."
 msgstr ""
 =

-#: query_hql.xml:884(para) =

+#. Tag: programlisting
+#: query_hql.xml:823
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
+      "from Cat cat\n"
+      "group by cat.color\n"
+      "having cat.color in (eg.Color.TABBY, eg.Color.BLACK)]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:825
+#, no-c-format
 msgid "SQL functions and aggregate functions are allowed in the <literal>h=
aving</literal> and <literal>order by</literal> clauses, if supported by th=
e underlying database (eg. not in MySQL)."
 msgstr ""
 =

-#: query_hql.xml:897(para) =

+#. Tag: programlisting
+#: query_hql.xml:831
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat\n"
+      "from Cat cat\n"
+      "    join cat.kittens kitten\n"
+      "group by cat.id, cat.name, cat.other, cat.properties\n"
+      "having avg(kitten.weight) > 100\n"
+      "order by count(kitten) asc, sum(kitten.weight) desc]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:833
+#, no-c-format
 msgid "Note that neither the <literal>group by</literal> clause nor the <l=
iteral>order by</literal> clause may contain arithmetic expressions. Also n=
ote that Hibernate currently does not expand a grouped entity, so you can't=
 write <literal>group by cat</literal> if all properties of <literal>cat</l=
iteral> are non-aggregated. You have to list all non-aggregated properties =
explicitly."
 msgstr ""
 =

-#: query_hql.xml:909(title) =

+#. Tag: title
+#: query_hql.xml:845
+#, no-c-format
 msgid "Subqueries"
 msgstr ""
 =

-#: query_hql.xml:911(para) =

+#. Tag: para
+#: query_hql.xml:847
+#, no-c-format
 msgid "For databases that support subselects, Hibernate supports subquerie=
s within queries. A subquery must be surrounded by parentheses (often by an=
 SQL aggregate function call). Even correlated subqueries (subqueries that =
refer to an alias in the outer query) are allowed."
 msgstr ""
 =

-#: query_hql.xml:940(para) =

+#. Tag: programlisting
+#: query_hql.xml:853
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as fatcat\n"
+      "where fatcat.weight > (\n"
+      "    select avg(cat.weight) from DomesticCat cat\n"
+      ")]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:855
+#, no-c-format
+msgid ""
+      "<![CDATA[from DomesticCat as cat\n"
+      "where cat.name =3D some (\n"
+      "    select name.nickName from Name as name\n"
+      ")]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:857
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "where not exists (\n"
+      "    from Cat as mate where mate.mate =3D cat\n"
+      ")]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:859
+#, no-c-format
+msgid ""
+      "<![CDATA[from DomesticCat as cat\n"
+      "where cat.name not in (\n"
+      "    select name.nickName from Name as name\n"
+      ")]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:861
+#, no-c-format
+msgid ""
+      "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit=
)\n"
+      "from Cat as cat]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:863
+#, no-c-format
 msgid "Note that HQL subqueries may occur only in the select or where clau=
ses."
 msgstr ""
 =

-#: query_hql.xml:944(para) =

+#. Tag: para
+#: query_hql.xml:867
+#, no-c-format
 msgid "Note that subqueries can also utilize <literal>row value constructo=
r</literal> syntax. See <xref linkend=3D\"queryhql-tuple\"/> for more detai=
ls."
 msgstr ""
 =

-#: query_hql.xml:952(title) =

+#. Tag: title
+#: query_hql.xml:875
+#, no-c-format
 msgid "HQL examples"
 msgstr ""
 =

-#: query_hql.xml:954(para) =

+#. Tag: para
+#: query_hql.xml:877
+#, no-c-format
 msgid "Hibernate queries can be quite powerful and complex. In fact, the p=
ower of the query language is one of Hibernate's main selling points. Here =
are some example queries very similar to queries that I used on a recent pr=
oject. Note that most queries you will write are much simpler than these!"
 msgstr ""
 =

-#: query_hql.xml:960(para) =

+#. Tag: para
+#: query_hql.xml:883
+#, no-c-format
 msgid "The following query returns the order id, number of items and total=
 value of the order for all unpaid orders for a particular customer and giv=
en minimum total value, ordering the results by total value. In determining=
 the prices, it uses the current catalog. The resulting SQL query, against =
the <literal>ORDER</literal>, <literal>ORDER_LINE</literal>, <literal>PRODU=
CT</literal>, <literal>CATALOG</literal> and <literal>PRICE</literal> table=
s has four inner joins and an (uncorrelated) subselect."
 msgstr ""
 =

-#: query_hql.xml:988(para) =

+#. Tag: programlisting
+#: query_hql.xml:892
+#, no-c-format
+msgid ""
+      "<![CDATA[select order.id, sum(price.amount), count(item)\n"
+      "from Order as order\n"
+      "    join order.lineItems as item\n"
+      "    join item.product as product,\n"
+      "    Catalog as catalog\n"
+      "    join catalog.prices as price\n"
+      "where order.paid =3D false\n"
+      "    and order.customer =3D :customer\n"
+      "    and price.product =3D product\n"
+      "    and catalog.effectiveDate < sysdate\n"
+      "    and catalog.effectiveDate >=3D all (\n"
+      "        select cat.effectiveDate\n"
+      "        from Catalog as cat\n"
+      "        where cat.effectiveDate < sysdate\n"
+      "    )\n"
+      "group by order\n"
+      "having sum(price.amount) > :minAmount\n"
+      "order by sum(price.amount) desc]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:894
+#, no-c-format
 msgid "What a monster! Actually, in real life, I'm not very keen on subque=
ries, so my query was really more like this:"
 msgstr ""
 =

-#: query_hql.xml:1007(para) =

+#. Tag: programlisting
+#: query_hql.xml:899
+#, no-c-format
+msgid ""
+      "<![CDATA[select order.id, sum(price.amount), count(item)\n"
+      "from Order as order\n"
+      "    join order.lineItems as item\n"
+      "    join item.product as product,\n"
+      "    Catalog as catalog\n"
+      "    join catalog.prices as price\n"
+      "where order.paid =3D false\n"
+      "    and order.customer =3D :customer\n"
+      "    and price.product =3D product\n"
+      "    and catalog =3D :currentCatalog\n"
+      "group by order\n"
+      "having sum(price.amount) > :minAmount\n"
+      "order by sum(price.amount) desc]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:901
+#, no-c-format
 msgid "The next query counts the number of payments in each status, exclud=
ing all payments in the <literal>AWAITING_APPROVAL</literal> status where t=
he most recent status change was made by the current user. It translates to=
 an SQL query with two inner joins and a correlated subselect against the <=
literal>PAYMENT</literal>, <literal>PAYMENT_STATUS</literal> and <literal>P=
AYMENT_STATUS_CHANGE</literal> tables."
 msgstr ""
 =

-#: query_hql.xml:1031(para) =

+#. Tag: programlisting
+#: query_hql.xml:909
+#, no-c-format
+msgid ""
+      "<![CDATA[select count(payment), status.name\n"
+      "from Payment as payment\n"
+      "    join payment.currentStatus as status\n"
+      "    join payment.statusChanges as statusChange\n"
+      "where payment.status.name <> PaymentStatus.AWAITING_APPROVAL\n"
+      "    or (\n"
+      "        statusChange.timeStamp =3D (\n"
+      "            select max(change.timeStamp)\n"
+      "            from PaymentStatusChange change\n"
+      "            where change.payment =3D payment\n"
+      "        )\n"
+      "        and statusChange.user <> :currentUser\n"
+      "    )\n"
+      "group by status.name, status.sortOrder\n"
+      "order by status.sortOrder]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:911
+#, no-c-format
 msgid "If I would have mapped the <literal>statusChanges</literal> collect=
ion as a list, instead of a set, the query would have been much simpler to =
write."
 msgstr ""
 =

-#: query_hql.xml:1044(para) =

+#. Tag: programlisting
+#: query_hql.xml:916
+#, no-c-format
+msgid ""
+      "<![CDATA[select count(payment), status.name\n"
+      "from Payment as payment\n"
+      "    join payment.currentStatus as status\n"
+      "where payment.status.name <> PaymentStatus.AWAITING_APPROVAL\n"
+      "    or payment.statusChanges[ maxIndex(payment.statusChanges) ].use=
r <> :currentUser\n"
+      "group by status.name, status.sortOrder\n"
+      "order by status.sortOrder]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:918
+#, no-c-format
 msgid "The next query uses the MS SQL Server <literal>isNull()</literal> f=
unction to return all the accounts and unpaid payments for the organization=
 to which the current user belongs. It translates to an SQL query with thre=
e inner joins, an outer join and a subselect against the <literal>ACCOUNT</=
literal>, <literal>PAYMENT</literal>, <literal>PAYMENT_STATUS</literal>, <l=
iteral>ACCOUNT_TYPE</literal>, <literal>ORGANIZATION</literal> and <literal=
>ORG_USER</literal> tables."
 msgstr ""
 =

-#: query_hql.xml:1060(para) =

+#. Tag: programlisting
+#: query_hql.xml:927
+#, no-c-format
+msgid ""
+      "<![CDATA[select account, payment\n"
+      "from Account as account\n"
+      "    left outer join account.payments as payment\n"
+      "where :currentUser in elements(account.holder.users)\n"
+      "    and PaymentStatus.UNPAID =3D isNull(payment.currentStatus.name,=
 PaymentStatus.UNPAID)\n"
+      "order by account.type.sortOrder, account.accountNumber, payment.due=
Date]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:929
+#, no-c-format
 msgid "For some databases, we would need to do away with the (correlated) =
subselect."
 msgstr ""
 =

-#: query_hql.xml:1075(title) =

+#. Tag: programlisting
+#: query_hql.xml:933
+#, no-c-format
+msgid ""
+      "<![CDATA[select account, payment\n"
+      "from Account as account\n"
+      "    join account.holder.users as user\n"
+      "    left outer join account.payments as payment\n"
+      "where :currentUser =3D user\n"
+      "    and PaymentStatus.UNPAID =3D isNull(payment.currentStatus.name,=
 PaymentStatus.UNPAID)\n"
+      "order by account.type.sortOrder, account.accountNumber, payment.due=
Date]]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:938
+#, no-c-format
 msgid "Bulk update and delete"
 msgstr ""
 =

-#: query_hql.xml:1077(para) =

+#. Tag: para
+#: query_hql.xml:940
+#, no-c-format
 msgid "HQL now supports <literal>update</literal>, <literal>delete</litera=
l> and <literal>insert ... select ...</literal> statements. See <xref linke=
nd=3D\"batch-direct\"/> for details."
 msgstr ""
 =

-#: query_hql.xml:1085(title) =

+#. Tag: title
+#: query_hql.xml:948
+#, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr ""
 =

-#: query_hql.xml:1087(para) =

+#. Tag: para
+#: query_hql.xml:950
+#, no-c-format
 msgid "You can count the number of query results without actually returnin=
g them:"
 msgstr ""
 =

-#: query_hql.xml:1093(para) =

+#. Tag: programlisting
+#: query_hql.xml:954
+#, no-c-format
+msgid "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ...=
.\").iterate().next() ).intValue()]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:956
+#, no-c-format
 msgid "To order a result by the size of a collection, use the following qu=
ery:"
 msgstr ""
 =

-#: query_hql.xml:1103(para) =

+#. Tag: programlisting
+#: query_hql.xml:960
+#, no-c-format
+msgid ""
+      "<![CDATA[select usr.id, usr.name\n"
+      "from User as usr\n"
+      "    left join usr.messages as msg\n"
+      "group by usr.id, usr.name\n"
+      "order by count(msg)]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:962
+#, no-c-format
 msgid "If your database supports subselects, you can place a condition upo=
n selection size in the where clause of your query:"
 msgstr ""
 =

-#: query_hql.xml:1110(para) =

+#. Tag: programlisting
+#: query_hql.xml:967
+#, no-c-format
+msgid "<![CDATA[from User usr where size(usr.messages) >=3D 1]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:969
+#, no-c-format
 msgid "If your database doesn't support subselects, use the following quer=
y:"
 msgstr ""
 =

-#: query_hql.xml:1120(para) =

+#. Tag: programlisting
+#: query_hql.xml:973
+#, no-c-format
+msgid ""
+      "<![CDATA[select usr.id, usr.name\n"
+      "from User usr.name\n"
+      "    join usr.messages msg\n"
+      "group by usr.id, usr.name\n"
+      "having count(msg) >=3D 1]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:975
+#, no-c-format
 msgid "As this solution can't return a <literal>User</literal> with zero m=
essages because of the inner join, the following form is also useful:"
 msgstr ""
 =

-#: query_hql.xml:1131(para) =

+#. Tag: programlisting
+#: query_hql.xml:980
+#, no-c-format
+msgid ""
+      "<![CDATA[select usr.id, usr.name\n"
+      "from User as usr\n"
+      "    left join usr.messages as msg\n"
+      "group by usr.id, usr.name\n"
+      "having count(msg) =3D 0]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:982
+#, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
 =

-#: query_hql.xml:1139(para) =

+#. Tag: programlisting
+#: query_hql.xml:986
+#, no-c-format
+msgid ""
+      "<![CDATA[Query q =3D s.createQuery(\"from foo Foo as foo where foo.=
name=3D:name and foo.size=3D:size\");\n"
+      "q.setProperties(fooBean); // fooBean has getName() and getSize()\n"
+      "List foos =3D q.list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:988
+#, no-c-format
 msgid "Collections are pageable by using the <literal>Query</literal> inte=
rface with a filter:"
 msgstr ""
 =

-#: query_hql.xml:1148(para) =

+#. Tag: programlisting
+#: query_hql.xml:992
+#, no-c-format
+msgid ""
+      "<![CDATA[Query q =3D s.createFilter( collection, \"\" ); // the tri=
vial filter\n"
+      "q.setMaxResults(PAGE_SIZE);\n"
+      "q.setFirstResult(PAGE_SIZE * pageNumber);\n"
+      "List page =3D q.list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:994
+#, no-c-format
 msgid "Collection elements may be ordered or grouped using a query filter:"
 msgstr ""
 =

-#: query_hql.xml:1155(para) =

+#. Tag: programlisting
+#: query_hql.xml:998
+#, no-c-format
+msgid ""
+      "<![CDATA[Collection orderedCollection =3D s.filter( collection, \"o=
rder by this.amount\" );\n"
+      "Collection counts =3D s.filter( collection, \"select this.type, cou=
nt(this) group by this.type\" );]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1000
+#, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr ""
 =

-#: query_hql.xml:1164(title) =

+#. Tag: programlisting
+#: query_hql.xml:1004
+#, no-c-format
+msgid "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ...=
.\").iterate().next() ).intValue();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:1009
+#, no-c-format
 msgid "Components"
 msgstr ""
 =

-#: query_hql.xml:1166(para) =

+#. Tag: para
+#: query_hql.xml:1011
+#, no-c-format
 msgid "Components might be used in just about every way that simple value =
types can be used in HQL queries. They can appear in the <literal>select</l=
iteral> clause:"
 msgstr ""
 =

-#: query_hql.xml:1174(para) =

+#. Tag: programlisting
+#: query_hql.xml:1016 query_hql.xml:1062
+#, no-c-format
+msgid "<![CDATA[select p.name from Person p]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:1017
+#, no-c-format
+msgid "<![CDATA[select p.name.first from Person p]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1019
+#, no-c-format
 msgid "where the Person's name property is a component. Components can als=
o be used in the <literal>where</literal> clause:"
 msgstr ""
 =

-#: query_hql.xml:1182(para) =

+#. Tag: programlisting
+#: query_hql.xml:1024
+#, no-c-format
+msgid "<![CDATA[from Person p where p.name =3D :name]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_hql.xml:1025
+#, no-c-format
+msgid "<![CDATA[from Person p where p.name.first =3D :firstName]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1027
+#, no-c-format
 msgid "Components can also be used in the <literal>order by</literal> clau=
se:"
 msgstr ""
 =

-#: query_hql.xml:1189(para) =

-msgid "Another common use of components is in <xref linkend=3D\"queryhql-t=
uple\">row value constructors</xref>."
+#. Tag: programlisting
+#: query_hql.xml:1031
+#, no-c-format
+msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 =

-#: query_hql.xml:1195(title) =

+#. Tag: programlisting
+#: query_hql.xml:1032
+#, no-c-format
+msgid "<![CDATA[from Person p order by p.name.first]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1034
+#, no-c-format
+msgid "Another common use of components is in <link linkend=3D\"queryhql-t=
uple\">row value constructors</link>."
+msgstr ""
+
+#. Tag: title
+#: query_hql.xml:1040
+#, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 =

-#: query_hql.xml:1197(para) =

+#. Tag: para
+#: query_hql.xml:1042
+#, no-c-format
 msgid "HQL supports the use of ANSI SQL <literal>row value constructor</li=
teral> syntax (sometimes called <literal>tuple</literal> syntax), even thou=
gh the underlying database may not support that notion. Here we are general=
ly referring to multi-valued comparisons, typically associated with compone=
nts. Consider an entity Person which defines a name component:"
 msgstr ""
 =

-#: query_hql.xml:1206(para) =

+#. Tag: programlisting
+#: query_hql.xml:1049
+#, no-c-format
+msgid "<![CDATA[from Person p where p.name.first=3D'John' and p.name.last=
=3D'Jingleheimer-Schmidt']]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1051
+#, no-c-format
 msgid "That's valid syntax, although a little verbose. It be nice to make =
this a bit more concise and use <literal>row value constructor</literal> sy=
ntax:"
 msgstr ""
 =

-#: query_hql.xml:1213(para) =

+#. Tag: programlisting
+#: query_hql.xml:1056
+#, no-c-format
+msgid "<![CDATA[from Person p where p.name=3D('John', 'Jingleheimer-Schmid=
t')]]>"
+msgstr ""
+
+#. Tag: para
+#: query_hql.xml:1058
+#, no-c-format
 msgid "It can also be useful to specify this in the <literal>select</liter=
al> clause:"
 msgstr ""
 =

-#: query_hql.xml:1219(para) =

+#. Tag: para
+#: query_hql.xml:1064
+#, no-c-format
 msgid "Another time using <literal>row value constructor</literal> syntax =
can be beneficial is when using subqueries needing to compare against multi=
ple values:"
 msgstr ""
 =

-#: query_hql.xml:1229(para) =

-msgid "One thing to consider when deciding if you want to use this syntax =
is that the query will be dependent upon the ordering of the component sub-=
properties in the metadata."
+#. Tag: programlisting
+#: query_hql.xml:1069
+#, no-c-format
+msgid ""
+      "<![CDATA[from Cat as cat\n"
+      "where not ( cat.name, cat.color ) in (\n"
+      "    select cat.name, cat.color from DomesticCat cat\n"
+      ")]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: query_hql.xml:0(None) =

-msgid "translator-credits"
+#. Tag: para
+#: query_hql.xml:1071
+#, no-c-format
+msgid "One thing to consider when deciding if you want to use this syntax =
is that the query will be dependent upon the ordering of the component sub-=
properties in the metadata."
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/quer=
y_sql.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.=
pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.=
pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,476 +1,1112 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:34-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: query_sql.xml:5(title) =

+#. Tag: title
+#: query_sql.xml:29
+#, no-c-format
 msgid "Native SQL"
 msgstr ""
 =

-#: query_sql.xml:7(para) =

+#. Tag: para
+#: query_sql.xml:31
+#, no-c-format
 msgid "You may also express queries in the native SQL dialect of your data=
base. This is useful if you want to utilize database specific features such=
 as query hints or the <literal>CONNECT</literal> keyword in Oracle. It als=
o provides a clean migration path from a direct SQL/JDBC based application =
to Hibernate."
 msgstr ""
 =

-#: query_sql.xml:13(para) =

+#. Tag: para
+#: query_sql.xml:37
+#, no-c-format
 msgid "Hibernate3 allows you to specify handwritten SQL (including stored =
procedures) for all create, update, delete, and load operations."
 msgstr ""
 =

-#: query_sql.xml:17(title) =

+#. Tag: title
+#: query_sql.xml:41
+#, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr ""
 =

-#: query_sql.xml:19(para) =

+#. Tag: para
+#: query_sql.xml:43
+#, no-c-format
 msgid "Execution of native SQL queries is controlled via the <literal>SQLQ=
uery</literal> interface, which is obtained by calling <literal>Session.cre=
ateSQLQuery()</literal>. The following describes how to use this API for qu=
erying."
 msgstr ""
 =

-#: query_sql.xml:25(title) =

+#. Tag: title
+#: query_sql.xml:49
+#, no-c-format
 msgid "Scalar queries"
 msgstr ""
 =

-#: query_sql.xml:27(para) =

+#. Tag: para
+#: query_sql.xml:51
+#, no-c-format
 msgid "The most basic SQL query is to get a list of scalars (values)."
 msgstr ""
 =

-#: query_sql.xml:34(para) =

+#. Tag: programlisting
+#: query_sql.xml:54
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").list();\n"
+      "sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE FROM CATS\").list(=
);\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:56
+#, no-c-format
 msgid "These will both return a List of Object arrays (Object[]) with scal=
ar values for each column in the CATS table. Hibernate will use ResultSetMe=
tadata to deduce the actual order and types of the returned scalar values."
 msgstr ""
 =

-#: query_sql.xml:39(para) =

+#. Tag: para
+#: query_sql.xml:61
+#, no-c-format
 msgid "To avoid the overhead of using <literal>ResultSetMetadata</literal>=
 or simply to be more explicit in what is returned one can use <literal>add=
Scalar()</literal>."
 msgstr ""
 =

-#: query_sql.xml:49(para) query_sql.xml:101(para) query_sql.xml:195(para) =
query_sql.xml:354(para) =

+#. Tag: programlisting
+#: query_sql.xml:65
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
+      " .addScalar(\"ID\", Hibernate.LONG)\n"
+      " .addScalar(\"NAME\", Hibernate.STRING)\n"
+      " .addScalar(\"BIRTHDATE\", Hibernate.DATE)\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:67 query_sql.xml:113 query_sql.xml:194 query_sql.xml:345
+#, no-c-format
 msgid "This query specified:"
 msgstr ""
 =

-#: query_sql.xml:53(para) query_sql.xml:105(para) query_sql.xml:358(para) =

+#. Tag: para
+#: query_sql.xml:71 query_sql.xml:117 query_sql.xml:349
+#, no-c-format
 msgid "the SQL query string"
 msgstr ""
 =

-#: query_sql.xml:57(para) =

+#. Tag: para
+#: query_sql.xml:75
+#, no-c-format
 msgid "the columns and types to return"
 msgstr ""
 =

-#: query_sql.xml:61(para) =

-msgid "This will still return Object arrays, but now it will not use <lite=
ral>ResultSetMetdata</literal> but will instead explicitly get the ID, NAME=
 and BIRTHDATE column as respectively a Long, String and a Short from the u=
nderlying resultset. This also means that only these three columns will be =
returned, even though the query is using <literal>*</literal> and could ret=
urn more than the three listed columns."
+#. Tag: para
+#: query_sql.xml:79
+#, no-c-format
+msgid "This will still return Object arrays, but now it will not use <lite=
ral>ResultSetMetadata</literal> but will instead explicitly get the ID, NAM=
E and BIRTHDATE column as respectively a Long, String and a Short from the =
underlying resultset. This also means that only these three columns will be=
 returned, even though the query is using <literal>*</literal> and could re=
turn more than the three listed columns."
 msgstr ""
 =

-#: query_sql.xml:69(para) =

+#. Tag: para
+#: query_sql.xml:87
+#, no-c-format
 msgid "It is possible to leave out the type information for all or some of=
 the scalars."
 msgstr ""
 =

-#: query_sql.xml:78(para) =

+#. Tag: programlisting
+#: query_sql.xml:90
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
+      " .addScalar(\"ID\", Hibernate.LONG)\n"
+      " .addScalar(\"NAME\")\n"
+      " .addScalar(\"BIRTHDATE\")\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:92
+#, no-c-format
 msgid "This is essentially the same query as before, but now <literal>Resu=
ltSetMetaData</literal> is used to decide the type of NAME and BIRTHDATE wh=
ere as the type of ID is explicitly specified."
 msgstr ""
 =

-#: query_sql.xml:82(para) =

+#. Tag: para
+#: query_sql.xml:96
+#, no-c-format
 msgid "How the java.sql.Types returned from ResultSetMetaData is mapped to=
 Hibernate types is controlled by the Dialect. If a specific type is not ma=
pped or does not result in the expected type it is possible to customize it=
 via calls to <literal>registerHibernateType</literal> in the Dialect."
 msgstr ""
 =

-#: query_sql.xml:90(title) =

+#. Tag: title
+#: query_sql.xml:104
+#, no-c-format
 msgid "Entity queries"
 msgstr ""
 =

-#: query_sql.xml:92(para) =

+#. Tag: para
+#: query_sql.xml:106
+#, no-c-format
 msgid "The above queries were all about returning scalar values, basically=
 returning the \"raw\" values from the resultset. The following shows how t=
o get entity objects from a native sql query via <literal>addEntity()</lite=
ral>."
 msgstr ""
 =

-#: query_sql.xml:109(para) =

+#. Tag: programlisting
+#: query_sql.xml:111
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\").addEntity(Cat.=
class);\n"
+      "sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE FROM CATS\").addEn=
tity(Cat.class);\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:121
+#, no-c-format
 msgid "the entity returned by the query"
 msgstr ""
 =

-#: query_sql.xml:113(para) =

+#. Tag: para
+#: query_sql.xml:125
+#, no-c-format
 msgid "Assuming that Cat is mapped as a class with the columns ID, NAME an=
d BIRTHDATE the above queries will both return a List where each element is=
 a Cat entity."
 msgstr ""
 =

-#: query_sql.xml:117(para) =

+#. Tag: para
+#: query_sql.xml:129
+#, no-c-format
 msgid "If the entity is mapped with a <literal>many-to-one</literal> to an=
other entity it is required to also return this when performing the native =
query, otherwise a database specific \"column not found\" error will occur.=
 The additional columns will automatically be returned when using the * not=
ation, but we prefer to be explicit as in the following example for a <lite=
ral>many-to-one</literal> to a <literal>Dog</literal>:"
 msgstr ""
 =

-#: query_sql.xml:128(para) =

+#. Tag: programlisting
+#: query_sql.xml:137
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, DOG_ID F=
ROM CATS\").addEntity(Cat.class);\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:139
+#, no-c-format
 msgid "This will allow cat.getDog() to function properly."
 msgstr ""
 =

-#: query_sql.xml:132(title) =

+#. Tag: title
+#: query_sql.xml:143
+#, no-c-format
 msgid "Handling associations and collections"
 msgstr ""
 =

-#: query_sql.xml:134(para) =

+#. Tag: para
+#: query_sql.xml:145
+#, no-c-format
 msgid "It is possible to eagerly join in the <literal>Dog</literal> to avo=
id the possible extra roundtrip for initializing the proxy. This is done vi=
a the <literal>addJoin()</literal> method, which allows you to join in an a=
ssociation or collection."
 msgstr ""
 =

-#: query_sql.xml:144(para) =

+#. Tag: programlisting
+#: query_sql.xml:150
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT c.ID, NAME, BIRTHDATE, DOG_ID=
, D_ID, D_NAME FROM CATS c, DOGS d WHERE c.DOG_ID =3D d.D_ID\")\n"
+      " .addEntity(\"cat\", Cat.class)\n"
+      " .addJoin(\"cat.dog\");\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:152
+#, no-c-format
 msgid "In this example the returned <literal>Cat</literal>'s will have the=
ir <literal>dog</literal> property fully initialized without any extra roun=
dtrip to the database. Notice that we added a alias name (\"cat\") to be ab=
le to specify the target property path of the join. It is possible to do th=
e same eager joining for collections, e.g. if the <literal>Cat</literal> ha=
d a one-to-many to <literal>Dog</literal> instead."
 msgstr ""
 =

-#: query_sql.xml:157(p) =

+#. Tag: programlisting
+#: query_sql.xml:160
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT ID, NAME, BIRTHDATE, D_ID, D_=
NAME, CAT_ID FROM CATS c, DOGS d WHERE c.ID =3D d.CAT_ID\")\n"
+      " .addEntity(\"cat\", Cat.class)\n"
+      " .addJoin(\"cat.dogs\");\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:162
+#, no-c-format
 msgid "At this stage we are reaching the limits of what is possible with n=
ative queries without starting to enhance the sql queries to make them usab=
le in Hibernate; the problems starts to arise when returning multiple entit=
ies of the same type or when the default alias/column names are not enough."
 msgstr ""
 =

-#: query_sql.xml:165(title) =

+#. Tag: title
+#: query_sql.xml:170
+#, no-c-format
 msgid "Returning multiple entities"
 msgstr ""
 =

-#: query_sql.xml:167(para) =

+#. Tag: para
+#: query_sql.xml:172
+#, no-c-format
 msgid "Until now the result set column names are assumed to be the same as=
 the column names specified in the mapping document. This can be problemati=
c for SQL queries which join multiple tables, since the same column names m=
ay appear in more than one table."
 msgstr ""
 =

-#: query_sql.xml:172(para) =

+#. Tag: para
+#: query_sql.xml:177
+#, no-c-format
 msgid "Column alias injection is needed in the following query (which most=
 likely will fail):"
 msgstr ""
 =

-#: query_sql.xml:180(para) =

-msgid "The intention for this query is to return two Cat instances per row=
, a cat and its mother. This will fail since there is a conflict of names s=
ince they are mapped to the same column names and on some databases the ret=
urned column aliases will most likely be on the form \"c.ID\", \"c.NAME\", =
etc. which are not equal to the columns specificed in the mappings (\"ID\" =
and \"NAME\")."
+#. Tag: programlisting
+#: query_sql.xml:180
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT c.*, m.*  FROM CATS c, CATS m=
 WHERE c.MOTHER_ID =3D c.ID\")\n"
+      " .addEntity(\"cat\", Cat.class)\n"
+      " .addEntity(\"mother\", Cat.class)\n"
+      "]]>"
 msgstr ""
 =

-#: query_sql.xml:187(para) =

+#. Tag: para
+#: query_sql.xml:182
+#, no-c-format
+msgid "The intention for this query is to return two Cat instances per row=
, a cat and its mother. This will fail since there is a conflict of names s=
ince they are mapped to the same column names and on some databases the ret=
urned column aliases will most likely be on the form \"c.ID\", \"c.NAME\", =
etc. which are not equal to the columns specified in the mappings (\"ID\" a=
nd \"NAME\")."
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:189
+#, no-c-format
 msgid "The following form is not vulnerable to column name duplication:"
 msgstr ""
 =

-#: query_sql.xml:199(para) =

+#. Tag: programlisting
+#: query_sql.xml:192
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CAT=
S c, CATS m WHERE c.MOTHER_ID =3D c.ID\")\n"
+      " .addEntity(\"cat\", Cat.class)\n"
+      " .addEntity(\"mother\", Cat.class)\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:198
+#, no-c-format
 msgid "the SQL query string, with placeholders for Hibernate to inject col=
umn aliases"
 msgstr ""
 =

-#: query_sql.xml:204(para) =

+#. Tag: para
+#: query_sql.xml:203
+#, no-c-format
 msgid "the entities returned by the query"
 msgstr ""
 =

-#: query_sql.xml:208(para) =

-msgid "The {cat.*} and {mother.*} notation used above is a shorthand for \=
"all properties\". Alternatively, you may list the columns explicity, but e=
ven in this case we let Hibernate inject the SQL column aliases for each pr=
operty. The placeholder for a column alias is just the property name qualif=
ied by the table alias. In the following example, we retrieve Cats and thei=
r mothers from a different table (cat_log) to the one declared in the mappi=
ng metadata. Notice that we may even use the property aliases in the where =
clause if we like."
+#. Tag: para
+#: query_sql.xml:207
+#, no-c-format
+msgid "The {cat.*} and {mother.*} notation used above is a shorthand for \=
"all properties\". Alternatively, you may list the columns explicitly, but =
even in this case we let Hibernate inject the SQL column aliases for each p=
roperty. The placeholder for a column alias is just the property name quali=
fied by the table alias. In the following example, we retrieve Cats and the=
ir mothers from a different table (cat_log) to the one declared in the mapp=
ing metadata. Notice that we may even use the property aliases in the where=
 clause if we like."
 msgstr ""
 =

-#: query_sql.xml:227(title) =

+#. Tag: programlisting
+#: query_sql.xml:216
+#, no-c-format
+msgid ""
+      "<![CDATA[String sql =3D \"SELECT ID as {c.id}, NAME as {c.name}, \"=
 + \n"
+      "         \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mo=
ther.*} \" +\n"
+      "         \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} =3D c.ID\";\n"
+      "\n"
+      "List loggedCats =3D sess.createSQLQuery(sql)\n"
+      "        .addEntity(\"cat\", Cat.class)\n"
+      "        .addEntity(\"mother\", Cat.class).list()\n"
+      "]]>"
+msgstr ""
+
+#. Tag: title
+#: query_sql.xml:219
+#, no-c-format
 msgid "Alias and property references"
 msgstr ""
 =

-#: query_sql.xml:229(para) =

+#. Tag: para
+#: query_sql.xml:221
+#, no-c-format
 msgid "For most cases the above alias injection is needed, but for queries=
 relating to more complex mappings like composite properties, inheritance d=
iscriminators, collections etc. there are some specific aliases to use to a=
llow Hibernate to inject the proper aliases."
 msgstr ""
 =

-#: query_sql.xml:234(para) =

+#. Tag: para
+#: query_sql.xml:226
+#, no-c-format
 msgid "The following table shows the different possibilities of using the =
alias injection. Note: the alias names in the result are examples, each ali=
as will have a unique and probably different name when used."
 msgstr ""
 =

-#: query_sql.xml:240(title) =

+#. Tag: title
+#: query_sql.xml:232
+#, no-c-format
 msgid "Alias injection names"
 msgstr ""
 =

-#: query_sql.xml:251(entry) =

+#. Tag: entry
+#: query_sql.xml:243
+#, no-c-format
 msgid "Description"
 msgstr ""
 =

-#: query_sql.xml:253(entry) =

+#. Tag: entry
+#: query_sql.xml:245
+#, no-c-format
 msgid "Syntax"
 msgstr ""
 =

-#: query_sql.xml:255(entry) =

+#. Tag: entry
+#: query_sql.xml:247
+#, no-c-format
 msgid "Example"
 msgstr ""
 =

-#: query_sql.xml:261(entry) =

+#. Tag: entry
+#: query_sql.xml:253
+#, no-c-format
 msgid "A simple property"
 msgstr ""
 =

-#: query_sql.xml:263(literal) =

+#. Tag: literal
+#: query_sql.xml:255
+#, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr ""
 =

-#: query_sql.xml:265(literal) =

+#. Tag: literal
+#: query_sql.xml:257
+#, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr ""
 =

-#: query_sql.xml:269(entry) =

+#. Tag: entry
+#: query_sql.xml:261
+#, no-c-format
 msgid "A composite property"
 msgstr ""
 =

-#: query_sql.xml:271(literal) =

+#. Tag: literal
+#: query_sql.xml:263
+#, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr ""
 =

-#: query_sql.xml:273(literal) =

+#. Tag: literal
+#: query_sql.xml:265
+#, no-c-format
 msgid "CURRENCY as {item.amount.currency}, VALUE as {item.amount.value}"
 msgstr ""
 =

-#: query_sql.xml:278(entry) =

+#. Tag: entry
+#: query_sql.xml:270
+#, no-c-format
 msgid "Discriminator of an entity"
 msgstr ""
 =

-#: query_sql.xml:280(literal) =

+#. Tag: literal
+#: query_sql.xml:272
+#, no-c-format
 msgid "{[aliasname].class}"
 msgstr ""
 =

-#: query_sql.xml:282(literal) =

+#. Tag: literal
+#: query_sql.xml:274
+#, no-c-format
 msgid "DISC as {item.class}"
 msgstr ""
 =

-#: query_sql.xml:286(entry) =

+#. Tag: entry
+#: query_sql.xml:278
+#, no-c-format
 msgid "All properties of an entity"
 msgstr ""
 =

-#: query_sql.xml:288(literal) query_sql.xml:336(literal) =

+#. Tag: literal
+#: query_sql.xml:280 query_sql.xml:328
+#, no-c-format
 msgid "{[aliasname].*}"
 msgstr ""
 =

-#: query_sql.xml:290(literal) =

+#. Tag: literal
+#: query_sql.xml:282
+#, no-c-format
 msgid "{item.*}"
 msgstr ""
 =

-#: query_sql.xml:294(entry) =

+#. Tag: entry
+#: query_sql.xml:286
+#, no-c-format
 msgid "A collection key"
 msgstr ""
 =

-#: query_sql.xml:296(literal) =

+#. Tag: literal
+#: query_sql.xml:288
+#, no-c-format
 msgid "{[aliasname].key}"
 msgstr ""
 =

-#: query_sql.xml:298(literal) =

+#. Tag: literal
+#: query_sql.xml:290
+#, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr ""
 =

-#: query_sql.xml:302(entry) =

+#. Tag: entry
+#: query_sql.xml:294
+#, no-c-format
 msgid "The id of an collection"
 msgstr ""
 =

-#: query_sql.xml:304(literal) =

+#. Tag: literal
+#: query_sql.xml:296
+#, no-c-format
 msgid "{[aliasname].id}"
 msgstr ""
 =

-#: query_sql.xml:306(literal) =

+#. Tag: literal
+#: query_sql.xml:298
+#, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr ""
 =

-#: query_sql.xml:310(entry) =

+#. Tag: entry
+#: query_sql.xml:302
+#, no-c-format
 msgid "The element of an collection"
 msgstr ""
 =

-#: query_sql.xml:312(literal) =

+#. Tag: literal
+#: query_sql.xml:304
+#, no-c-format
 msgid "{[aliasname].element}"
 msgstr ""
 =

-#: query_sql.xml:314(literal) =

+#. Tag: literal
+#: query_sql.xml:306
+#, no-c-format
 msgid "XID as {coll.element}"
 msgstr ""
 =

-#: query_sql.xml:318(entry) =

+#. Tag: entry
+#: query_sql.xml:310
+#, no-c-format
 msgid "roperty of the element in the collection"
 msgstr ""
 =

-#: query_sql.xml:320(literal) =

+#. Tag: literal
+#: query_sql.xml:312
+#, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr ""
 =

-#: query_sql.xml:322(literal) =

+#. Tag: literal
+#: query_sql.xml:314
+#, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr ""
 =

-#: query_sql.xml:326(entry) =

+#. Tag: entry
+#: query_sql.xml:318
+#, no-c-format
 msgid "All properties of the element in the collection"
 msgstr ""
 =

-#: query_sql.xml:328(literal) =

+#. Tag: literal
+#: query_sql.xml:320
+#, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr ""
 =

-#: query_sql.xml:330(literal) =

+#. Tag: literal
+#: query_sql.xml:322
+#, no-c-format
 msgid "{coll.element.*}"
 msgstr ""
 =

-#: query_sql.xml:334(entry) =

+#. Tag: entry
+#: query_sql.xml:326
+#, no-c-format
 msgid "All properties of the the collection"
 msgstr ""
 =

-#: query_sql.xml:338(literal) =

+#. Tag: literal
+#: query_sql.xml:330
+#, no-c-format
 msgid "{coll.*}"
 msgstr ""
 =

-#: query_sql.xml:347(title) =

+#. Tag: title
+#: query_sql.xml:339
+#, no-c-format
 msgid "Returning non-managed entities"
 msgstr ""
 =

-#: query_sql.xml:349(para) =

+#. Tag: para
+#: query_sql.xml:341
+#, no-c-format
 msgid "It is possible to apply a ResultTransformer to native sql queries. =
Allowing it to e.g. return non-managed entities."
 msgstr ""
 =

-#: query_sql.xml:362(para) =

+#. Tag: programlisting
+#: query_sql.xml:343
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\=
n"
+      "        .setResultTransformer(Transformers.aliasToBean(CatDTO.class=
))]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:353
+#, no-c-format
 msgid "a result transformer"
 msgstr ""
 =

-#: query_sql.xml:366(para) =

+#. Tag: para
+#: query_sql.xml:357
+#, no-c-format
 msgid "The above query will return a list of <literal>CatDTO</literal> whi=
ch has been instantiated and injected the values of NAME and BIRTHNAME into=
 its corresponding properties or fields."
 msgstr ""
 =

-#: query_sql.xml:373(title) =

+#. Tag: title
+#: query_sql.xml:364
+#, no-c-format
 msgid "Handling inheritance"
 msgstr ""
 =

-#: query_sql.xml:375(para) =

+#. Tag: para
+#: query_sql.xml:366
+#, no-c-format
 msgid "Native sql queries which query for entities that is mapped as part =
of an inheritance must include all properties for the baseclass and all it =
subclasses."
 msgstr ""
 =

-#: query_sql.xml:381(title) =

+#. Tag: title
+#: query_sql.xml:372
+#, no-c-format
 msgid "Parameters"
 msgstr ""
 =

-#: query_sql.xml:383(para) =

+#. Tag: para
+#: query_sql.xml:374
+#, no-c-format
 msgid "Native sql queries support positional as well as named parameters:"
 msgstr ""
 =

-#: query_sql.xml:398(title) =

+#. Tag: programlisting
+#: query_sql.xml:377
+#, no-c-format
+msgid ""
+      "<![CDATA[Query query =3D sess.createSQLQuery(\"SELECT * FROM CATS W=
HERE NAME like ?\").addEntity(Cat.class);\n"
+      "List pusList =3D query.setString(0, \"Pus%\").list();\n"
+      "     \n"
+      "query =3D sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME like =
:name\").addEntity(Cat.class);\n"
+      "List pusList =3D query.setString(\"name\", \"Pus%\").list();       =
   ]]>"
+msgstr ""
+
+#. Tag: title
+#: query_sql.xml:385
+#, no-c-format
 msgid "Named SQL queries"
 msgstr ""
 =

-#: query_sql.xml:400(para) =

+#. Tag: para
+#: query_sql.xml:387
+#, no-c-format
 msgid "Named SQL queries may be defined in the mapping document and called=
 in exactly the same way as a named HQL query. In this case, we do <emphasi=
s>not</emphasis> need to call <literal>addEntity()</literal>."
 msgstr ""
 =

-#: query_sql.xml:419(para) =

+#. Tag: programlisting
+#: query_sql.xml:392
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"persons\">\n"
+      "    <return alias=3D\"person\" class=3D\"eg.Person\"/>\n"
+      "    SELECT person.NAME AS {person.name},\n"
+      "           person.AGE AS {person.age},\n"
+      "           person.SEX AS {person.sex}\n"
+      "    FROM PERSON person\n"
+      "    WHERE person.NAME LIKE :namePattern\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_sql.xml:394
+#, no-c-format
+msgid ""
+      "<![CDATA[List people =3D sess.getNamedQuery(\"persons\")\n"
+      "    .setString(\"namePattern\", namePattern)\n"
+      "    .setMaxResults(50)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:396
+#, no-c-format
 msgid "The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-co=
llection&gt;</literal> elements are used to join associations and define qu=
eries which initialize collections, respectively."
 msgstr ""
 =

-#: query_sql.xml:440(para) =

+#. Tag: programlisting
+#: query_sql.xml:401
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"personsWith\">\n"
+      "    <return alias=3D\"person\" class=3D\"eg.Person\"/>\n"
+      "    <return-join alias=3D\"address\" property=3D\"person.mailingAdd=
ress\"/>\n"
+      "    SELECT person.NAME AS {person.name},\n"
+      "           person.AGE AS {person.age},\n"
+      "           person.SEX AS {person.sex},\n"
+      "           address.STREET AS {address.street},\n"
+      "           address.CITY AS {address.city},\n"
+      "           address.STATE AS {address.state},\n"
+      "           address.ZIP AS {address.zip}\n"
+      "    FROM PERSON person\n"
+      "    JOIN ADDRESS address\n"
+      "        ON person.ID =3D address.PERSON_ID AND address.TYPE=3D'MAIL=
ING'\n"
+      "    WHERE person.NAME LIKE :namePattern\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:403
+#, no-c-format
 msgid "A named SQL query may return a scalar value. You must declare the c=
olumn alias and Hibernate type using the <literal>&lt;return-scalar&gt;</li=
teral> element:"
 msgstr ""
 =

-#: query_sql.xml:452(para) =

-msgid "You can externalize the resultset mapping informations in a <litera=
l>&lt;resultset&gt;</literal> element to either reuse them accross several =
named queries or through the <literal>setResultSetMapping()</literal> API."
+#. Tag: programlisting
+#: query_sql.xml:407
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"mySqlQuery\">\n"
+      "    <return-scalar column=3D\"name\" type=3D\"string\"/>\n"
+      "    <return-scalar column=3D\"age\" type=3D\"long\"/>\n"
+      "    SELECT p.NAME AS name,\n"
+      "           p.AGE AS age,\n"
+      "    FROM PERSON p WHERE p.NAME LIKE 'Hiber%'\n"
+      "</sql-query>]]>"
 msgstr ""
 =

-#: query_sql.xml:476(para) =

+#. Tag: para
+#: query_sql.xml:409
+#, no-c-format
+msgid "You can externalize the resultset mapping informations in a <litera=
l>&lt;resultset&gt;</literal> element to either reuse them across several n=
amed queries or through the <literal>setResultSetMapping()</literal> API."
+msgstr ""
+
+#. Tag: programlisting
+#: query_sql.xml:414
+#, no-c-format
+msgid ""
+      "<![CDATA[<resultset name=3D\"personAddress\">\n"
+      "    <return alias=3D\"person\" class=3D\"eg.Person\"/>\n"
+      "    <return-join alias=3D\"address\" property=3D\"person.mailingAdd=
ress\"/>\n"
+      "</resultset>\n"
+      "\n"
+      "<sql-query name=3D\"personsWith\" resultset-ref=3D\"personAddress\"=
>\n"
+      "    SELECT person.NAME AS {person.name},\n"
+      "           person.AGE AS {person.age},\n"
+      "           person.SEX AS {person.sex},\n"
+      "           address.STREET AS {address.street},\n"
+      "           address.CITY AS {address.city},\n"
+      "           address.STATE AS {address.state},\n"
+      "           address.ZIP AS {address.zip}\n"
+      "    FROM PERSON person\n"
+      "    JOIN ADDRESS address\n"
+      "        ON person.ID =3D address.PERSON_ID AND address.TYPE=3D'MAIL=
ING'\n"
+      "    WHERE person.NAME LIKE :namePattern\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:416
+#, no-c-format
 msgid "You can alternatively use the resultset mapping information in your=
 hbm files directly in java code."
 msgstr ""
 =

-#: query_sql.xml:486(title) =

+#. Tag: programlisting
+#: query_sql.xml:419
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D sess.createSQLQuery(\n"
+      "        \"select {cat.*}, {kitten.*} from cats cat, cats kitten whe=
re kitten.mother =3D cat.id\"\n"
+      "    )\n"
+      "    .setResultSetMapping(\"catAndKitten\")\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: query_sql.xml:422
+#, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr ""
 =

-#: query_sql.xml:489(para) =

+#. Tag: para
+#: query_sql.xml:425
+#, no-c-format
 msgid "With <literal>&lt;return-property&gt;</literal> you can explicitly =
tell Hibernate what column aliases to use, instead of using the <literal>{}=
</literal>-syntax to let Hibernate inject its own aliases."
 msgstr ""
 =

-#: query_sql.xml:507(para) =

+#. Tag: programlisting
+#: query_sql.xml:430
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"mySqlQuery\">\n"
+      "    <return alias=3D\"person\" class=3D\"eg.Person\">\n"
+      "        <return-property name=3D\"name\" column=3D\"myName\"/>\n"
+      "        <return-property name=3D\"age\" column=3D\"myAge\"/>\n"
+      "        <return-property name=3D\"sex\" column=3D\"mySex\"/>\n"
+      "    </return>\n"
+      "    SELECT person.NAME AS myName,\n"
+      "           person.AGE AS myAge,\n"
+      "           person.SEX AS mySex,\n"
+      "    FROM PERSON person WHERE person.NAME LIKE :name\n"
+      "</sql-query>\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:432
+#, no-c-format
 msgid "<literal>&lt;return-property&gt;</literal> also works with multiple=
 columns. This solves a limitation with the <literal>{}</literal>-syntax wh=
ich can not allow fine grained control of multi-column properties."
 msgstr ""
 =

-#: query_sql.xml:528(para) =

+#. Tag: programlisting
+#: query_sql.xml:437
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"organizationCurrentEmployments\">\n"
+      "    <return alias=3D\"emp\" class=3D\"Employment\">\n"
+      "        <return-property name=3D\"salary\">\n"
+      "            <return-column name=3D\"VALUE\"/>\n"
+      "            <return-column name=3D\"CURRENCY\"/>\n"
+      "        </return-property>\n"
+      "        <return-property name=3D\"endDate\" column=3D\"myEndDate\"/=
>\n"
+      "    </return>\n"
+      "        SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employe=
r},\n"
+      "        STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate},\n"
+      "        REGIONCODE as {emp.regionCode}, EID AS {emp.id}, VALUE, CUR=
RENCY\n"
+      "        FROM EMPLOYMENT\n"
+      "        WHERE EMPLOYER =3D :id AND ENDDATE IS NULL\n"
+      "        ORDER BY STARTDATE ASC\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:439
+#, no-c-format
 msgid "Notice that in this example we used <literal>&lt;return-property&gt=
;</literal> in combination with the <literal>{}</literal>-syntax for inject=
ion. Allowing users to choose how they want to refer column and properties."
 msgstr ""
 =

-#: query_sql.xml:533(para) =

+#. Tag: para
+#: query_sql.xml:444
+#, no-c-format
 msgid "If your mapping has a discriminator you must use <literal>&lt;retur=
n-discriminator&gt;</literal> to specify the discriminator column."
 msgstr ""
 =

-#: query_sql.xml:539(title) =

+#. Tag: title
+#: query_sql.xml:450
+#, no-c-format
 msgid "Using stored procedures for querying"
 msgstr ""
 =

-#: query_sql.xml:541(para) =

+#. Tag: para
+#: query_sql.xml:452
+#, no-c-format
 msgid "Hibernate 3 introduces support for queries via stored procedures an=
d functions. Most of the following documentation is equivalent for both. Th=
e stored procedure/function must return a resultset as the first out-parame=
ter to be able to work with Hibernate. An example of such a stored function=
 in Oracle 9 and higher is as follows:"
 msgstr ""
 =

-#: query_sql.xml:560(para) =

+#. Tag: programlisting
+#: query_sql.xml:458
+#, no-c-format
+msgid ""
+      "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
+      "    RETURN SYS_REFCURSOR\n"
+      "AS\n"
+      "    st_cursor SYS_REFCURSOR;\n"
+      "BEGIN\n"
+      "    OPEN st_cursor FOR\n"
+      " SELECT EMPLOYEE, EMPLOYER,\n"
+      " STARTDATE, ENDDATE,\n"
+      " REGIONCODE, EID, VALUE, CURRENCY\n"
+      " FROM EMPLOYMENT;\n"
+      "      RETURN  st_cursor;\n"
+      " END;]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:460
+#, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query=
."
 msgstr ""
 =

-#: query_sql.xml:579(para) =

+#. Tag: programlisting
+#: query_sql.xml:463
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"selectAllEmployees_SP\" callable=3D\"t=
rue\">\n"
+      "    <return alias=3D\"emp\" class=3D\"Employment\">\n"
+      "        <return-property name=3D\"employee\" column=3D\"EMPLOYEE\"/=
>\n"
+      "        <return-property name=3D\"employer\" column=3D\"EMPLOYER\"/=
>\n"
+      "        <return-property name=3D\"startDate\" column=3D\"STARTDATE\=
"/>\n"
+      "        <return-property name=3D\"endDate\" column=3D\"ENDDATE\"/>\=
n"
+      "        <return-property name=3D\"regionCode\" column=3D\"REGIONCOD=
E\"/>\n"
+      "        <return-property name=3D\"id\" column=3D\"EID\"/>\n"
+      "        <return-property name=3D\"salary\">\n"
+      "            <return-column name=3D\"VALUE\"/>\n"
+      "            <return-column name=3D\"CURRENCY\"/>\n"
+      "        </return-property>\n"
+      "    </return>\n"
+      "    { ? =3D call selectAllEmployments() }\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:465
+#, no-c-format
 msgid "Notice stored procedures currently only return scalars and entities=
. <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-collection&g=
t;</literal> are not supported."
 msgstr ""
 =

-#: query_sql.xml:584(title) =

+#. Tag: title
+#: query_sql.xml:470
+#, no-c-format
 msgid "Rules/limitations for using stored procedures"
 msgstr ""
 =

-#: query_sql.xml:586(para) =

+#. Tag: para
+#: query_sql.xml:472
+#, no-c-format
 msgid "To use stored procedures with Hibernate the procedures/functions ha=
ve to follow some rules. If they do not follow those rules they are not usa=
ble with Hibernate. If you still want to use these procedures you have to e=
xecute them via <literal>session.connection()</literal>. The rules are diff=
erent for each database, since database vendors have different stored proce=
dure semantics/syntax."
 msgstr ""
 =

-#: query_sql.xml:593(para) =

+#. Tag: para
+#: query_sql.xml:479
+#, no-c-format
 msgid "Stored procedure queries can't be paged with <literal>setFirstResul=
t()/setMaxResults()</literal>."
 msgstr ""
 =

-#: query_sql.xml:596(para) =

+#. Tag: para
+#: query_sql.xml:482
+#, no-c-format
 msgid "Recommended call form is standard SQL92: <literal>{ ? =3D call func=
tionName(&lt;parameters&gt;) }</literal> or <literal>{ ? =3D call procedure=
Name(&lt;parameters&gt;}</literal>. Native call syntax is not supported."
 msgstr ""
 =

-#: query_sql.xml:601(para) =

+#. Tag: para
+#: query_sql.xml:487
+#, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr ""
 =

-#: query_sql.xml:605(para) =

+#. Tag: para
+#: query_sql.xml:491
+#, no-c-format
 msgid "A function must return a result set. The first parameter of a proce=
dure must be an <literal>OUT</literal> that returns a result set. This is d=
one by using a <literal>SYS_REFCURSOR</literal> type in Oracle 9 or 10. In =
Oracle you need to define a <literal>REF CURSOR</literal> type, see Oracle =
literature."
 msgstr ""
 =

-#: query_sql.xml:614(para) =

+#. Tag: para
+#: query_sql.xml:500
+#, no-c-format
 msgid "For Sybase or MS SQL server the following rules apply:"
 msgstr ""
 =

-#: query_sql.xml:618(para) =

+#. Tag: para
+#: query_sql.xml:504
+#, no-c-format
 msgid "The procedure must return a result set. Note that since these serve=
rs can/will return multiple result sets and update counts, Hibernate will i=
terate the results and take the first result that is a result set as its re=
turn value. Everything else will be discarded."
 msgstr ""
 =

-#: query_sql.xml:626(para) =

+#. Tag: para
+#: query_sql.xml:512
+#, no-c-format
 msgid "If you can enable <literal>SET NOCOUNT ON</literal> in your procedu=
re it will probably be more efficient, but this is not a requirement."
 msgstr ""
 =

-#: query_sql.xml:636(title) =

+#. Tag: title
+#: query_sql.xml:522
+#, no-c-format
 msgid "Custom SQL for create, update and delete"
 msgstr ""
 =

-#: query_sql.xml:638(para) =

+#. Tag: para
+#: query_sql.xml:524
+#, no-c-format
 msgid "Hibernate3 can use custom SQL statements for create, update, and de=
lete operations. The class and collection persisters in Hibernate already c=
ontain a set of configuration time generated strings (insertsql, deletesql,=
 updatesql etc.). The mapping tags <literal>&lt;sql-insert&gt;</literal>, <=
literal>&lt;sql-delete&gt;</literal>, and <literal>&lt;sql-update&gt;</lite=
ral> override these strings:"
 msgstr ""
 =

-#: query_sql.xml:656(para) =

+#. Tag: programlisting
+#: query_sql.xml:532
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"increment\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"name\" not-null=3D\"true\"/>\n"
+      "    <sql-insert>INSERT INTO PERSON (NAME, ID) VALUES ( UPPER(?), ? =
)</sql-insert>\n"
+      "    <sql-update>UPDATE PERSON SET NAME=3DUPPER(?) WHERE ID=3D?</sql=
-update>\n"
+      "    <sql-delete>DELETE FROM PERSON WHERE ID=3D?</sql-delete>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:534
+#, no-c-format
 msgid "The SQL is directly executed in your database, so you are free to u=
se any dialect you like. This will of course reduce the portability of your=
 mapping if you use database specific SQL."
 msgstr ""
 =

-#: query_sql.xml:660(para) =

+#. Tag: para
+#: query_sql.xml:538
+#, no-c-format
 msgid "Stored procedures are supported if the <literal>callable</literal> =
attribute is set:"
 msgstr ""
 =

-#: query_sql.xml:673(para) =

+#. Tag: programlisting
+#: query_sql.xml:541
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"increment\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"name\" not-null=3D\"true\"/>\n"
+      "    <sql-insert callable=3D\"true\">{call createPerson (?, ?)}</sql=
-insert>\n"
+      "    <sql-delete callable=3D\"true\">{? =3D call deletePerson (?)}</=
sql-delete>\n"
+      "    <sql-update callable=3D\"true\">{? =3D call updatePerson (?, ?)=
}</sql-update>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:543
+#, no-c-format
 msgid "The order of the positional parameters are currently vital, as they=
 must be in the same sequence as Hibernate expects them."
 msgstr ""
 =

-#: query_sql.xml:676(para) =

+#. Tag: para
+#: query_sql.xml:546
+#, no-c-format
 msgid "You can see the expected order by enabling debug logging for the <l=
iteral>org.hibernate.persister.entity</literal> level. With this level enab=
led Hibernate will print out the static SQL that is used to create, update,=
 delete etc. entities. (To see the expected sequence, remember to not inclu=
de your custom SQL in the mapping files as that will override the Hibernate=
 generated static sql.)"
 msgstr ""
 =

-#: query_sql.xml:683(para) =

+#. Tag: para
+#: query_sql.xml:553
+#, no-c-format
 msgid "The stored procedures are in most cases (read: better do it than no=
t) required to return the number of rows inserted/updated/deleted, as Hiber=
nate has some runtime checks for the success of the statement. Hibernate al=
ways registers the first statement parameter as a numeric output parameter =
for the CUD operations:"
 msgstr ""
 =

-#: query_sql.xml:705(title) =

+#. Tag: programlisting
+#: query_sql.xml:559
+#, no-c-format
+msgid ""
+      "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, un=
ame IN VARCHAR2)\n"
+      "    RETURN NUMBER IS\n"
+      "BEGIN\n"
+      "\n"
+      "    update PERSON\n"
+      "    set\n"
+      "        NAME =3D uname,\n"
+      "    where\n"
+      "        ID =3D uid;\n"
+      "\n"
+      "    return SQL%ROWCOUNT;\n"
+      "\n"
+      "END updatePerson;]]>"
+msgstr ""
+
+#. Tag: title
+#: query_sql.xml:563
+#, no-c-format
 msgid "Custom SQL for loading"
 msgstr ""
 =

-#: query_sql.xml:707(para) =

+#. Tag: para
+#: query_sql.xml:565
+#, no-c-format
 msgid "You may also declare your own SQL (or HQL) queries for entity loadi=
ng:"
 msgstr ""
 =

-#: query_sql.xml:718(para) =

+#. Tag: programlisting
+#: query_sql.xml:568
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"person\">\n"
+      "    <return alias=3D\"pers\" class=3D\"Person\" lock-mode=3D\"upgra=
de\"/>\n"
+      "    SELECT NAME AS {pers.name}, ID AS {pers.id}\n"
+      "    FROM PERSON\n"
+      "    WHERE ID=3D?\n"
+      "    FOR UPDATE\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:570
+#, no-c-format
 msgid "This is just a named query declaration, as discussed earlier. You m=
ay reference this named query in a class mapping:"
 msgstr ""
 =

-#: query_sql.xml:729(para) =

+#. Tag: programlisting
+#: query_sql.xml:573
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Person\">\n"
+      "    <id name=3D\"id\">\n"
+      "        <generator class=3D\"increment\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"name\" not-null=3D\"true\"/>\n"
+      "    <loader query-ref=3D\"person\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:575
+#, no-c-format
 msgid "This even works with stored procedures."
 msgstr ""
 =

-#: query_sql.xml:731(para) =

+#. Tag: para
+#: query_sql.xml:577
+#, no-c-format
 msgid "You may even define a query for collection loading:"
 msgstr ""
 =

-#: query_sql.xml:747(para) =

+#. Tag: programlisting
+#: query_sql.xml:579
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"employments\" inverse=3D\"true\">\n"
+      "    <key/>\n"
+      "    <one-to-many class=3D\"Employment\"/>\n"
+      "    <loader query-ref=3D\"employments\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: query_sql.xml:581
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"employments\">\n"
+      "    <load-collection alias=3D\"emp\" role=3D\"Person.employments\"/=
>\n"
+      "    SELECT {emp.*}\n"
+      "    FROM EMPLOYMENT emp\n"
+      "    WHERE EMPLOYER =3D :id\n"
+      "    ORDER BY STARTDATE ASC, EMPLOYEE ASC\n"
+      "</sql-query>]]>"
+msgstr ""
+
+#. Tag: para
+#: query_sql.xml:583
+#, no-c-format
 msgid "You could even define an entity loader that loads a collection by j=
oin fetching:"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: query_sql.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: query_sql.xml:586
+#, no-c-format
+msgid ""
+      "<![CDATA[<sql-query name=3D\"person\">\n"
+      "    <return alias=3D\"pers\" class=3D\"Person\"/>\n"
+      "    <return-join alias=3D\"emp\" property=3D\"pers.employments\"/>\=
n"
+      "    SELECT NAME AS {pers.*}, {emp.*}\n"
+      "    FROM PERSON pers\n"
+      "    LEFT OUTER JOIN EMPLOYMENT emp\n"
+      "        ON pers.ID =3D emp.PERSON_ID\n"
+      "    WHERE ID=3D?\n"
+      "</sql-query>]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/sess=
ion_api.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/session_ap=
i.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/session_ap=
i.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,636 +1,1354 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:34-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: session_api.xml:5(title) =

+#. Tag: title
+#: session_api.xml:29
+#, no-c-format
 msgid "Working with objects"
 msgstr ""
 =

-#: session_api.xml:7(para) =

+#. Tag: para
+#: session_api.xml:31
+#, no-c-format
 msgid "Hibernate is a full object/relational mapping solution that not onl=
y shields the developer from the details of the underlying database managem=
ent system, but also offers <emphasis>state management</emphasis> of object=
s. This is, contrary to the management of SQL <literal>statements</literal>=
 in common JDBC/SQL persistence layers, a very natural object-oriented view=
 of persistence in Java applications."
 msgstr ""
 =

-#: session_api.xml:16(para) =

+#. Tag: para
+#: session_api.xml:40
+#, no-c-format
 msgid "In other words, Hibernate application developers should always thin=
k about the <emphasis>state</emphasis> of their objects, and not necessaril=
y about the execution of SQL statements. This part is taken care of by Hibe=
rnate and is only relevant for the application developer when tuning the pe=
rformance of the system."
 msgstr ""
 =

-#: session_api.xml:24(title) =

+#. Tag: title
+#: session_api.xml:48
+#, no-c-format
 msgid "Hibernate object states"
 msgstr ""
 =

-#: session_api.xml:26(para) =

+#. Tag: para
+#: session_api.xml:50
+#, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr ""
 =

-#: session_api.xml:32(para) =

+#. Tag: para
+#: session_api.xml:56
+#, no-c-format
 msgid "<emphasis>Transient</emphasis> - an object is transient if it has j=
ust been instantiated using the <literal>new</literal> operator, and it is =
not associated with a Hibernate <literal>Session</literal>. It has no persi=
stent representation in the database and no identifier value has been assig=
ned. Transient instances will be destroyed by the garbage collector if the =
application doesn't hold a reference anymore. Use the Hibernate <literal>Se=
ssion</literal> to make an object persistent (and let Hibernate take care o=
f the SQL statements that need to be executed for this transition)."
 msgstr ""
 =

-#: session_api.xml:44(para) =

+#. Tag: para
+#: session_api.xml:68
+#, no-c-format
 msgid "<emphasis>Persistent</emphasis> - a persistent instance has a repre=
sentation in the database and an identifier value. It might just have been =
saved or loaded, however, it is by definition in the scope of a <literal>Se=
ssion</literal>. Hibernate will detect any changes made to an object in per=
sistent state and synchronize the state with the database when the unit of =
work completes. Developers don't execute manual <literal>UPDATE</literal> s=
tatements, or <literal>DELETE</literal> statements when an object should be=
 made transient."
 msgstr ""
 =

-#: session_api.xml:55(para) =

+#. Tag: para
+#: session_api.xml:79
+#, no-c-format
 msgid "<emphasis>Detached</emphasis> - a detached instance is an object th=
at has been persistent, but its <literal>Session</literal> has been closed.=
 The reference to the object is still valid, of course, and the detached in=
stance might even be modified in this state. A detached instance can be rea=
ttached to a new <literal>Session</literal> at a later point in time, makin=
g it (and all the modifications) persistent again. This feature enables a p=
rogramming model for long running units of work that require user think-tim=
e. We call them <emphasis>application transactions</emphasis>, i.e. a unit =
of work from the point of view of the user."
 msgstr ""
 =

-#: session_api.xml:69(para) =

+#. Tag: para
+#: session_api.xml:93
+#, no-c-format
 msgid "We'll now discuss the states and state transitions (and the Hiberna=
te methods that trigger a transition) in more detail."
 msgstr ""
 =

-#: session_api.xml:77(title) =

+#. Tag: title
+#: session_api.xml:101
+#, no-c-format
 msgid "Making objects persistent"
 msgstr ""
 =

-#: session_api.xml:79(para) =

+#. Tag: para
+#: session_api.xml:103
+#, no-c-format
 msgid "Newly instantiated instances of a a persistent class are considered=
 <emphasis>transient</emphasis> by Hibernate. We can make a transient insta=
nce <emphasis>persistent</emphasis> by associating it with a session:"
 msgstr ""
 =

-#: session_api.xml:92(para) =

+#. Tag: programlisting
+#: session_api.xml:110
+#, no-c-format
+msgid ""
+      "<![CDATA[DomesticCat fritz =3D new DomesticCat();\n"
+      "fritz.setColor(Color.GINGER);\n"
+      "fritz.setSex('M');\n"
+      "fritz.setName(\"Fritz\");\n"
+      "Long generatedId =3D (Long) sess.save(fritz);]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:112
+#, no-c-format
 msgid "If <literal>Cat</literal> has a generated identifier, the identifie=
r is generated and assigned to the <literal>cat</literal> when <literal>sav=
e()</literal> is called. If <literal>Cat</literal> has an <literal>assigned=
</literal> identifier, or a composite key, the identifier should be assigne=
d to the <literal>cat</literal> instance before calling <literal>save()</li=
teral>. You may also use <literal>persist()</literal> instead of <literal>s=
ave()</literal>, with the semantics defined in the EJB3 early draft."
 msgstr ""
 =

-#: session_api.xml:104(para) =

+#. Tag: para
+#: session_api.xml:124
+#, no-c-format
 msgid "<literal>persist()</literal> makes a transient instance persistent.=
 However, it doesn't guarantee that the identifier value will be assigned t=
o the persistent instance immediately, the assignment might happen at flush=
 time. <literal>persist()</literal> also guarantees that it will not execut=
e an <literal>INSERT</literal> statement if it is called outside of transac=
tion boundaries. This is useful in long-running conversations with an exten=
ded Session/persistence context."
 msgstr ""
 =

-#: session_api.xml:115(para) =

+#. Tag: para
+#: session_api.xml:135
+#, no-c-format
 msgid "<literal>save()</literal> does guarantee to return an identifier. I=
f an INSERT has to be executed to get the identifier ( e.g. \"identity\" ge=
nerator, not \"sequence\"), this INSERT happens immediately, no matter if y=
ou are inside or outside of a transaction. This is problematic in a long-ru=
nning conversation with an extended Session/persistence context."
 msgstr ""
 =

-#: session_api.xml:125(para) =

+#. Tag: para
+#: session_api.xml:145
+#, no-c-format
 msgid "Alternatively, you may assign the identifier using an overloaded ve=
rsion of <literal>save()</literal>."
 msgstr ""
 =

-#: session_api.xml:138(para) =

+#. Tag: programlisting
+#: session_api.xml:150
+#, no-c-format
+msgid ""
+      "<![CDATA[DomesticCat pk =3D new DomesticCat();\n"
+      "pk.setColor(Color.TABBY);\n"
+      "pk.setSex('F');\n"
+      "pk.setName(\"PK\");\n"
+      "pk.setKittens( new HashSet() );\n"
+      "pk.addKitten(fritz);\n"
+      "sess.save( pk, new Long(1234) );]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:152
+#, no-c-format
 msgid "If the object you make persistent has associated objects (e.g. the =
<literal>kittens</literal> collection in the previous example), these objec=
ts may be made persistent in any order you like unless you have a <literal>=
NOT NULL</literal> constraint upon a foreign key column. There is never a r=
isk of violating foreign key constraints. However, you might violate a <lit=
eral>NOT NULL</literal> constraint if you <literal>save()</literal> the obj=
ects in the wrong order."
 msgstr ""
 =

-#: session_api.xml:148(para) =

+#. Tag: para
+#: session_api.xml:162
+#, no-c-format
 msgid "Usually you don't bother with this detail, as you'll very likely us=
e Hibernate's <emphasis>transitive persistence</emphasis> feature to save t=
he associated objects automatically. Then, even <literal>NOT NULL</literal>=
 constraint violations don't occur - Hibernate will take care of everything=
. Transitive persistence is discussed later in this chapter."
 msgstr ""
 =

-#: session_api.xml:159(title) =

+#. Tag: title
+#: session_api.xml:173
+#, no-c-format
 msgid "Loading an object"
 msgstr ""
 =

-#: session_api.xml:161(para) =

+#. Tag: para
+#: session_api.xml:175
+#, no-c-format
 msgid "The <literal>load()</literal> methods of <literal>Session</literal>=
 gives you a way to retrieve a persistent instance if you already know its =
identifier. <literal>load()</literal> takes a class object and will load th=
e state into a newly instantiated instance of that class, in persistent sta=
te."
 msgstr ""
 =

-#: session_api.xml:174(para) =

+#. Tag: programlisting
+#: session_api.xml:182
+#, no-c-format
+msgid "<![CDATA[Cat fritz =3D (Cat) sess.load(Cat.class, generatedId);]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: session_api.xml:184
+#, no-c-format
+msgid ""
+      "<![CDATA[// you need to wrap primitive identifiers\n"
+      "long id =3D 1234;\n"
+      "DomesticCat pk =3D (DomesticCat) sess.load( DomesticCat.class, new =
Long(id) );]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:186
+#, no-c-format
 msgid "Alternatively, you can load state into a given instance:"
 msgstr ""
 =

-#: session_api.xml:183(para) =

+#. Tag: programlisting
+#: session_api.xml:190
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D new DomesticCat();\n"
+      "// load pk's state into cat\n"
+      "sess.load( cat, new Long(pkId) );\n"
+      "Set kittens =3D cat.getKittens();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:192
+#, no-c-format
 msgid "Note that <literal>load()</literal> will throw an unrecoverable exc=
eption if there is no matching database row. If the class is mapped with a =
proxy, <literal>load()</literal> just returns an uninitialized proxy and do=
es not actually hit the database until you invoke a method of the proxy. Th=
is behaviour is very useful if you wish to create an association to an obje=
ct without actually loading it from the database. It also allows multiple i=
nstances to be loaded as a batch if <literal>batch-size</literal> is define=
d for the class mapping."
 msgstr ""
 =

-#: session_api.xml:194(para) =

+#. Tag: para
+#: session_api.xml:203
+#, no-c-format
 msgid "If you are not certain that a matching row exists, you should use t=
he <literal>get()</literal> method, which hits the database immediately and=
 returns null if there is no matching row."
 msgstr ""
 =

-#: session_api.xml:207(para) =

+#. Tag: programlisting
+#: session_api.xml:209
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat cat =3D (Cat) sess.get(Cat.class, id);\n"
+      "if (cat=3D=3Dnull) {\n"
+      "    cat =3D new Cat();\n"
+      "    sess.save(cat, id);\n"
+      "}\n"
+      "return cat;]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:211
+#, no-c-format
 msgid "You may even load an object using an SQL <literal>SELECT ... FOR UP=
DATE</literal>, using a <literal>LockMode</literal>. See the API documentat=
ion for more information."
 msgstr ""
 =

-#: session_api.xml:214(para) =

+#. Tag: programlisting
+#: session_api.xml:216
+#, no-c-format
+msgid "<![CDATA[Cat cat =3D (Cat) sess.get(Cat.class, id, LockMode.UPGRADE=
);]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:218
+#, no-c-format
 msgid "Note that any associated instances or contained collections are <em=
phasis>not</emphasis> selected <literal>FOR UPDATE</literal>, unless you de=
cide to specify <literal>lock</literal> or <literal>all</literal> as a casc=
ade style for the association."
 msgstr ""
 =

-#: session_api.xml:221(para) =

+#. Tag: para
+#: session_api.xml:225
+#, no-c-format
 msgid "It is possible to re-load an object and all its collections at any =
time, using the <literal>refresh()</literal> method. This is useful when da=
tabase triggers are used to initialize some of the properties of the object=
."
 msgstr ""
 =

-#: session_api.xml:231(para) =

+#. Tag: programlisting
+#: session_api.xml:231
+#, no-c-format
+msgid ""
+      "<![CDATA[sess.save(cat);\n"
+      "sess.flush(); //force the SQL INSERT\n"
+      "sess.refresh(cat); //re-read the state (after the trigger executes)=
]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:233
+#, no-c-format
 msgid "An important question usually appears at this point: How much does =
Hibernate load from the database and how many SQL <literal>SELECT</literal>=
s will it use? This depends on the <emphasis>fetching strategy</emphasis> a=
nd is explained in <xref linkend=3D\"performance-fetching\"/>."
 msgstr ""
 =

-#: session_api.xml:241(title) =

+#. Tag: title
+#: session_api.xml:243
+#, no-c-format
 msgid "Querying"
 msgstr ""
 =

-#: session_api.xml:243(para) =

+#. Tag: para
+#: session_api.xml:245
+#, no-c-format
 msgid "If you don't know the identifiers of the objects you are looking fo=
r, you need a query. Hibernate supports an easy-to-use but powerful object =
oriented query language (HQL). For programmatic query creation, Hibernate s=
upports a sophisticated Criteria and Example query feature (QBC and QBE). Y=
ou may also express your query in the native SQL of your database, with opt=
ional support from Hibernate for result set conversion into objects."
 msgstr ""
 =

-#: session_api.xml:253(title) =

+#. Tag: title
+#: session_api.xml:255
+#, no-c-format
 msgid "Executing queries"
 msgstr ""
 =

-#: session_api.xml:255(para) =

+#. Tag: para
+#: session_api.xml:257
+#, no-c-format
 msgid "HQL and native SQL queries are represented with an instance of <lit=
eral>org.hibernate.Query</literal>. This interface offers methods for param=
eter binding, result set handling, and for the execution of the actual quer=
y. You always obtain a <literal>Query</literal> using the current <literal>=
Session</literal>:"
 msgstr ""
 =

-#: session_api.xml:286(para) =

+#. Tag: programlisting
+#: session_api.xml:264
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D session.createQuery(\n"
+      "    \"from Cat as cat where cat.birthdate < ?\")\n"
+      "    .setDate(0, date)\n"
+      "    .list();\n"
+      "\n"
+      "List mothers =3D session.createQuery(\n"
+      "    \"select mother from Cat as cat join cat.mother as mother where=
 cat.name =3D ?\")\n"
+      "    .setString(0, name)\n"
+      "    .list();\n"
+      "\n"
+      "List kittens =3D session.createQuery(\n"
+      "    \"from Cat as cat where cat.mother =3D ?\")\n"
+      "    .setEntity(0, pk)\n"
+      "    .list();\n"
+      "\n"
+      "Cat mother =3D (Cat) session.createQuery(\n"
+      "    \"select cat.mother from Cat as cat where cat =3D ?\")\n"
+      "    .setEntity(0, izi)\n"
+      "    .uniqueResult();]]\n"
+      "\n"
+      "Query mothersWithKittens =3D (Cat) session.createQuery(\n"
+      "    \"select mother from Cat as mother left join fetch mother.kitte=
ns\");\n"
+      "Set uniqueMothers =3D new HashSet(mothersWithKittens.list());]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:266
+#, no-c-format
 msgid "A query is usually executed by invoking <literal>list()</literal>, =
the result of the query will be loaded completely into a collection in memo=
ry. Entity instances retrieved by a query are in persistent state. The <lit=
eral>uniqueResult()</literal> method offers a shortcut if you know your que=
ry will only return a single object. Note that queries that make use of eag=
er fetching of collections usually return duplicates of the root objects (b=
ut with their collections initialized). You can filter these duplicates sim=
ply through a <literal>Set</literal>."
 msgstr ""
 =

-#: session_api.xml:298(title) =

+#. Tag: title
+#: session_api.xml:278
+#, no-c-format
 msgid "Iterating results"
 msgstr ""
 =

-#: session_api.xml:300(para) =

+#. Tag: para
+#: session_api.xml:280
+#, no-c-format
 msgid "Occasionally, you might be able to achieve better performance by ex=
ecuting the query using the <literal>iterate()</literal> method. This will =
only usually be the case if you expect that the actual entity instances ret=
urned by the query will already be in the session or second-level cache. If=
 they are not already cached, <literal>iterate()</literal> will be slower t=
han <literal>list()</literal> and might require many database hits for a si=
mple query, usually <emphasis>1</emphasis> for the initial select which onl=
y returns identifiers, and <emphasis>n</emphasis> additional selects to ini=
tialize the actual instances."
 msgstr ""
 =

-#: session_api.xml:327(title) =

+#. Tag: programlisting
+#: session_api.xml:292
+#, no-c-format
+msgid ""
+      "<![CDATA[// fetch ids\n"
+      "Iterator iter =3D sess.createQuery(\"from eg.Qux q order by q.likel=
iness\").iterate();\n"
+      "while ( iter.hasNext() ) {\n"
+      "    Qux qux =3D (Qux) iter.next();  // fetch the object\n"
+      "    // something we couldnt express in the query\n"
+      "    if ( qux.calculateComplicatedAlgorithm() ) {\n"
+      "        // delete the current instance\n"
+      "        iter.remove();\n"
+      "        // dont need to process the rest\n"
+      "        break;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: session_api.xml:296
+#, no-c-format
 msgid "Queries that return tuples"
 msgstr ""
 =

-#: session_api.xml:329(para) =

+#. Tag: para
+#: session_api.xml:298
+#, no-c-format
 msgid "Hibernate queries sometimes return tuples of objects, in which case=
 each tuple is returned as an array:"
 msgstr ""
 =

-#: session_api.xml:349(title) =

+#. Tag: programlisting
+#: session_api.xml:303
+#, no-c-format
+msgid ""
+      "<![CDATA[Iterator kittensAndMothers =3D sess.createQuery(\n"
+      "            \"select kitten, mother from Cat kitten join kitten.mot=
her mother\")\n"
+      "            .list()\n"
+      "            .iterator();\n"
+      "\n"
+      "while ( kittensAndMothers.hasNext() ) {\n"
+      "    Object[] tuple =3D (Object[]) kittensAndMothers.next();\n"
+      "    Cat kitten =3D (Cat) tuple[0];\n"
+      "    Cat mother =3D (Cat) tuple[1];\n"
+      "    ....\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: session_api.xml:308
+#, no-c-format
 msgid "Scalar results"
 msgstr ""
 =

-#: session_api.xml:351(para) =

+#. Tag: para
+#: session_api.xml:310
+#, no-c-format
 msgid "Queries may specify a property of a class in the <literal>select</l=
iteral> clause. They may even call SQL aggregate functions. Properties or a=
ggregates are considered \"scalar\" results (and not entities in persistent=
 state)."
 msgstr ""
 =

-#: session_api.xml:374(title) =

+#. Tag: programlisting
+#: session_api.xml:316
+#, no-c-format
+msgid ""
+      "<![CDATA[Iterator results =3D sess.createQuery(\n"
+      "        \"select cat.color, min(cat.birthdate), count(cat) from Cat=
 cat \" +\n"
+      "        \"group by cat.color\")\n"
+      "        .list()\n"
+      "        .iterator();\n"
+      "\n"
+      "while ( results.hasNext() ) {\n"
+      "    Object[] row =3D (Object[]) results.next();\n"
+      "    Color type =3D (Color) row[0];\n"
+      "    Date oldest =3D (Date) row[1];\n"
+      "    Integer count =3D (Integer) row[2];\n"
+      "    .....\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: title
+#: session_api.xml:321
+#, no-c-format
 msgid "Bind parameters"
 msgstr ""
 =

-#: session_api.xml:376(para) =

+#. Tag: para
+#: session_api.xml:323
+#, no-c-format
 msgid "Methods on <literal>Query</literal> are provided for binding values=
 to named parameters or JDBC-style <literal>?</literal> parameters. <emphas=
is>Contrary to JDBC, Hibernate numbers parameters from zero.</emphasis> Nam=
ed parameters are identifiers of the form <literal>:name</literal> in the q=
uery string. The advantages of named parameters are:"
 msgstr ""
 =

-#: session_api.xml:386(para) =

+#. Tag: para
+#: session_api.xml:333
+#, no-c-format
 msgid "named parameters are insensitive to the order they occur in the que=
ry string"
 msgstr ""
 =

-#: session_api.xml:392(para) =

+#. Tag: para
+#: session_api.xml:339
+#, no-c-format
 msgid "they may occur multiple times in the same query"
 msgstr ""
 =

-#: session_api.xml:397(para) =

+#. Tag: para
+#: session_api.xml:344
+#, no-c-format
 msgid "they are self-documenting"
 msgstr ""
 =

-#: session_api.xml:424(title) =

+#. Tag: programlisting
+#: session_api.xml:350
+#, no-c-format
+msgid ""
+      "<![CDATA[//named parameter (preferred)\n"
+      "Query q =3D sess.createQuery(\"from DomesticCat cat where cat.name =
=3D :name\");\n"
+      "q.setString(\"name\", \"Fritz\");\n"
+      "Iterator cats =3D q.iterate();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: session_api.xml:352
+#, no-c-format
+msgid ""
+      "<![CDATA[//positional parameter\n"
+      "Query q =3D sess.createQuery(\"from DomesticCat cat where cat.name =
=3D ?\");\n"
+      "q.setString(0, \"Izi\");\n"
+      "Iterator cats =3D q.iterate();]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: session_api.xml:354
+#, no-c-format
+msgid ""
+      "<![CDATA[//named parameter list\n"
+      "List names =3D new ArrayList();\n"
+      "names.add(\"Izi\");\n"
+      "names.add(\"Fritz\");\n"
+      "Query q =3D sess.createQuery(\"from DomesticCat cat where cat.name =
in (:namesList)\");\n"
+      "q.setParameterList(\"namesList\", names);\n"
+      "List cats =3D q.list();]]>"
+msgstr ""
+
+#. Tag: title
+#: session_api.xml:359
+#, no-c-format
 msgid "Pagination"
 msgstr ""
 =

-#: session_api.xml:426(para) =

+#. Tag: para
+#: session_api.xml:361
+#, no-c-format
 msgid "If you need to specify bounds upon your result set (the maximum num=
ber of rows you want to retrieve and / or the first row you want to retriev=
e) you should use methods of the <literal>Query</literal> interface:"
 msgstr ""
 =

-#: session_api.xml:437(para) =

+#. Tag: programlisting
+#: session_api.xml:367
+#, no-c-format
+msgid ""
+      "<![CDATA[Query q =3D sess.createQuery(\"from DomesticCat cat\");\n"
+      "q.setFirstResult(20);\n"
+      "q.setMaxResults(10);\n"
+      "List cats =3D q.list();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:369
+#, no-c-format
 msgid "Hibernate knows how to translate this limit query into the native S=
QL of your DBMS."
 msgstr ""
 =

-#: session_api.xml:445(title) =

+#. Tag: title
+#: session_api.xml:377
+#, no-c-format
 msgid "Scrollable iteration"
 msgstr ""
 =

-#: session_api.xml:447(para) =

+#. Tag: para
+#: session_api.xml:379
+#, no-c-format
 msgid "If your JDBC driver supports scrollable <literal>ResultSet</literal=
>s, the <literal>Query</literal> interface may be used to obtain a <literal=
>ScrollableResults</literal> object, which allows flexible navigation of th=
e query results."
 msgstr ""
 =

-#: session_api.xml:476(para) =

+#. Tag: programlisting
+#: session_api.xml:386
+#, no-c-format
+msgid ""
+      "<![CDATA[Query q =3D sess.createQuery(\"select cat.name, cat from D=
omesticCat cat \" +\n"
+      "                            \"order by cat.name\");\n"
+      "ScrollableResults cats =3D q.scroll();\n"
+      "if ( cats.first() ) {\n"
+      "\n"
+      "    // find the first name on each page of an alphabetical list of =
cats by name\n"
+      "    firstNamesOfPages =3D new ArrayList();\n"
+      "    do {\n"
+      "        String name =3D cats.getString(0);\n"
+      "        firstNamesOfPages.add(name);\n"
+      "    }\n"
+      "    while ( cats.scroll(PAGE_SIZE) );\n"
+      "\n"
+      "    // Now get the first page of cats\n"
+      "    pageOfCats =3D new ArrayList();\n"
+      "    cats.beforeFirst();\n"
+      "    int i=3D0;\n"
+      "    while( ( PAGE_SIZE > i++ ) && cats.next() ) pageOfCats.add( cat=
s.get(1) );\n"
+      "\n"
+      "}\n"
+      "cats.close()]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:388
+#, no-c-format
 msgid "Note that an open database connection (and cursor) is required for =
this functionality, use <literal>setMaxResult()</literal>/<literal>setFirst=
Result()</literal> if you need offline pagination functionality."
 msgstr ""
 =

-#: session_api.xml:485(title) =

+#. Tag: title
+#: session_api.xml:397
+#, no-c-format
 msgid "Externalizing named queries"
 msgstr ""
 =

-#: session_api.xml:487(para) =

+#. Tag: para
+#: session_api.xml:399
+#, no-c-format
 msgid "You may also define named queries in the mapping document. (Remembe=
r to use a <literal>CDATA</literal> section if your query contains characte=
rs that could be interpreted as markup.)"
 msgstr ""
 =

-#: session_api.xml:499(para) =

+#. Tag: programlisting
+#: session_api.xml:405
+#, no-c-format
+msgid ""
+      "<![CDATA[<query name=3D\"ByNameAndMaximumWeight\"><![CDATA[\n"
+      "    from eg.DomesticCat as cat\n"
+      "        where cat.name =3D ?\n"
+      "        and cat.weight > ?\n"
+      "] ]></query>]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:407
+#, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr ""
 =

-#: session_api.xml:508(para) =

+#. Tag: programlisting
+#: session_api.xml:411
+#, no-c-format
+msgid ""
+      "<![CDATA[Query q =3D sess.getNamedQuery(\"ByNameAndMaximumWeight\")=
;\n"
+      "q.setString(0, name);\n"
+      "q.setInt(1, minWeight);\n"
+      "List cats =3D q.list();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:413
+#, no-c-format
 msgid "Note that the actual program code is independent of the query langu=
age that is used, you may also define native SQL queries in metadata, or mi=
grate existing queries to Hibernate by placing them in mapping files."
 msgstr ""
 =

-#: session_api.xml:514(para) =

+#. Tag: para
+#: session_api.xml:419
+#, no-c-format
 msgid "Also note that a query declaration inside a <literal>&lt;hibernate-=
mapping&gt;</literal> element requires a global unique name for the query, =
while a query declaration inside a <literal>&lt;class&gt;</literal> element=
 is made unique automatically by prepending the fully qualified name of the=
 class, for example <literal>eg.Cat.ByNameAndMaximumWeight</literal>."
 msgstr ""
 =

-#: session_api.xml:527(title) =

+#. Tag: title
+#: session_api.xml:432
+#, no-c-format
 msgid "Filtering collections"
 msgstr ""
 =

-#: session_api.xml:528(para) =

+#. Tag: para
+#: session_api.xml:433
+#, no-c-format
 msgid "A collection <emphasis>filter</emphasis> is a special type of query=
 that may be applied to a persistent collection or array. The query string =
may refer to <literal>this</literal>, meaning the current collection elemen=
t."
 msgstr ""
 =

-#: session_api.xml:541(para) =

+#. Tag: programlisting
+#: session_api.xml:439
+#, no-c-format
+msgid ""
+      "<![CDATA[Collection blackKittens =3D session.createFilter(\n"
+      "    pk.getKittens(), \n"
+      "    \"where this.color =3D ?\")\n"
+      "    .setParameter( Color.BLACK, Hibernate.custom(ColorUserType.clas=
s) )\n"
+      "    .list()\n"
+      ");]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:441
+#, no-c-format
 msgid "The returned collection is considered a bag, and it's a copy of the=
 given collection. The original collection is not modified (this is contrar=
y to the implication of the name \"filter\", but consistent with expected b=
ehavior)."
 msgstr ""
 =

-#: session_api.xml:547(para) =

+#. Tag: para
+#: session_api.xml:447
+#, no-c-format
 msgid "Observe that filters do not require a <literal>from</literal> claus=
e (though they may have one if required). Filters are not limited to return=
ing the collection elements themselves."
 msgstr ""
 =

-#: session_api.xml:557(para) =

+#. Tag: programlisting
+#: session_api.xml:452
+#, no-c-format
+msgid ""
+      "<![CDATA[Collection blackKittenMates =3D session.createFilter(\n"
+      "    pk.getKittens(), \n"
+      "    \"select this.mate where this.color =3D eg.Color.BLACK.intValue=
\")\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:454
+#, no-c-format
 msgid "Even an empty filter query is useful, e.g. to load a subset of elem=
ents in a huge collection:"
 msgstr ""
 =

-#: session_api.xml:570(title) =

+#. Tag: programlisting
+#: session_api.xml:459
+#, no-c-format
+msgid ""
+      "<![CDATA[Collection tenKittens =3D session.createFilter(\n"
+      "    mother.getKittens(), \"\")\n"
+      "    .setFirstResult(0).setMaxResults(10)\n"
+      "    .list();]]>"
+msgstr ""
+
+#. Tag: title
+#: session_api.xml:464
+#, no-c-format
 msgid "Criteria queries"
 msgstr ""
 =

-#: session_api.xml:572(para) =

+#. Tag: para
+#: session_api.xml:466
+#, no-c-format
 msgid "HQL is extremely powerful but some developers prefer to build queri=
es dynamically, using an object-oriented API, rather than building query st=
rings. Hibernate provides an intuitive <literal>Criteria</literal> query AP=
I for these cases:"
 msgstr ""
 =

-#: session_api.xml:583(para) =

+#. Tag: programlisting
+#: session_api.xml:472
+#, no-c-format
+msgid ""
+      "<![CDATA[Criteria crit =3D session.createCriteria(Cat.class);\n"
+      "crit.add( Restrictions.eq( \"color\", eg.Color.BLACK ) );\n"
+      "crit.setMaxResults(10);\n"
+      "List cats =3D crit.list();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:474
+#, no-c-format
 msgid "The <literal>Criteria</literal> and the associated <literal>Example=
</literal> API are discussed in more detail in <xref linkend=3D\"querycrite=
ria\"/>."
 msgstr ""
 =

-#: session_api.xml:591(title) =

+#. Tag: title
+#: session_api.xml:482
+#, no-c-format
 msgid "Queries in native SQL"
 msgstr ""
 =

-#: session_api.xml:593(para) =

+#. Tag: para
+#: session_api.xml:484
+#, no-c-format
 msgid "You may express a query in SQL, using <literal>createSQLQuery()</li=
teral> and let Hibernate take care of the mapping from result sets to objec=
ts. Note that you may at any time call <literal>session.connection()</liter=
al> and use the JDBC <literal>Connection</literal> directly. If you chose t=
o use the Hibernate API, you must enclose SQL aliases in braces:"
 msgstr ""
 =

-#: session_api.xml:612(para) =

-msgid "SQL queries may contain named and positional parameters, just like =
Hibernate queries. More information about native SQL queries in Hibernate c=
an be found in <xref linkend=3D\"querysql\"/>."
+#. Tag: programlisting
+#: session_api.xml:492
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D session.createSQLQuery(\"SELECT {cat.*} FROM=
 CAT {cat} WHERE ROWNUM<10\")\n"
+      "    .addEntity(\"cat\", Cat.class)\n"
+      ".list();]]>"
 msgstr ""
 =

-#: session_api.xml:623(title) =

-msgid "Modifying persistent objects"
+#. Tag: programlisting
+#: session_api.xml:494
+#, no-c-format
+msgid ""
+      "<![CDATA[List cats =3D session.createSQLQuery(\n"
+      "    \"SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, \" +\n"
+      "           \"{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class=
}, ... \" +\n"
+      "    \"FROM CAT {cat} WHERE ROWNUM<10\")\n"
+      "    .addEntity(\"cat\", Cat.class)\n"
+      ".list()]]>"
 msgstr ""
 =

-#: session_api.xml:625(para) =

-msgid "<emphasis>Transactional persistent instances</emphasis> (ie. object=
s loaded, saved, created or queried by the <literal>Session</literal>) may =
be manipulated by the application and any changes to persistent state will =
be persisted when the <literal>Session</literal> is <emphasis>flushed</emph=
asis> (discussed later in this chapter). There is no need to call a particu=
lar method (like <literal>update()</literal>, which has a different purpose=
) to make your modifications persistent. So the most straightforward way to=
 update the state of an object is to <literal>load()</literal> it, and then=
 manipulate it directly, while the <literal>Session</literal> is open:"
+#. Tag: para
+#: session_api.xml:496
+#, no-c-format
+msgid "SQL queries may contain named and positional parameters, just like =
Hibernate queries. More information about native SQL queries in Hibernate c=
an be found in <xref linkend=3D\"querysql\"/>."
 msgstr ""
 =

-#: session_api.xml:640(para) =

-msgid "Sometimes this programming model is inefficient since it would requ=
ire both an SQL <literal>SELECT</literal> (to load an object) and an SQL <l=
iteral>UPDATE</literal> (to persist its updated state) in the same session.=
 Therefore Hibernate offers an alternate approach, using detached instances=
."
+#. Tag: title
+#: session_api.xml:507
+#, no-c-format
+msgid "Modifying persistent objects"
 msgstr ""
 =

-#: session_api.xml:649(literal) =

-msgid "UPDATE"
+#. Tag: para
+#: session_api.xml:509
+#, no-c-format
+msgid "<emphasis>Transactional persistent instances</emphasis> (ie. object=
s loaded, saved, created or queried by the <literal>Session</literal>) may =
be manipulated by the application and any changes to persistent state will =
be persisted when the <literal>Session</literal> is <emphasis>flushed</emph=
asis> (discussed later in this chapter). There is no need to call a particu=
lar method (like <literal>update()</literal>, which has a different purpose=
) to make your modifications persistent. So the most straightforward way to=
 update the state of an object is to <literal>load()</literal> it, and then=
 manipulate it directly, while the <literal>Session</literal> is open:"
 msgstr ""
 =

-#: session_api.xml:649(literal) =

-msgid "DELETE"
+#. Tag: programlisting
+#: session_api.xml:520
+#, no-c-format
+msgid ""
+      "<![CDATA[DomesticCat cat =3D (DomesticCat) sess.load( Cat.class, ne=
w Long(69) );\n"
+      "cat.setName(\"PK\");\n"
+      "sess.flush();  // changes to cat are automatically detected and per=
sisted]]>"
 msgstr ""
 =

-#: session_api.xml:650(emphasis) =

-msgid "state management"
+#. Tag: para
+#: session_api.xml:522
+#, no-c-format
+msgid "Sometimes this programming model is inefficient since it would requ=
ire both an SQL <literal>SELECT</literal> (to load an object) and an SQL <l=
iteral>UPDATE</literal> (to persist its updated state) in the same session.=
 Therefore Hibernate offers an alternate approach, using detached instances=
."
 msgstr ""
 =

-#: session_api.xml:651(emphasis) =

-msgid "statements"
+#. Tag: emphasis
+#: session_api.xml:530
+#, no-c-format
+msgid "Note that Hibernate does not offer its own API for direct execution=
 of <literal>UPDATE</literal> or <literal>DELETE</literal> statements. Hibe=
rnate is a <emphasis>state management</emphasis> service, you don't have to=
 think in <emphasis>statements</emphasis> to use it. JDBC is a perfect API =
for executing SQL statements, you can get a JDBC <literal>Connection</liter=
al> at any time by calling <literal>session.connection()</literal>. Further=
more, the notion of mass operations conflicts with object/relational mappin=
g for online transaction processing-oriented applications. Future versions =
of Hibernate may however provide special mass operation functions. See <xre=
f linkend=3D\"batch\"/> for some possible batch operation tricks."
 msgstr ""
 =

-#: session_api.xml:652(literal) =

-msgid "Connection"
-msgstr ""
-
-#: session_api.xml:653(literal) =

-msgid "session.connection()"
-msgstr ""
-
-#: session_api.xml:648(emphasis) =

-msgid "Note that Hibernate does not offer its own API for direct execution=
 of <placeholder-1/> or <placeholder-2/> statements. Hibernate is a <placeh=
older-3/> service, you don't have to think in <placeholder-4/> to use it. J=
DBC is a perfect API for executing SQL statements, you can get a JDBC <plac=
eholder-5/> at any time by calling <placeholder-6/>. Furthermore, the notio=
n of mass operations conflicts with object/relational mapping for online tr=
ansaction processing-oriented applications. Future versions of Hibernate ma=
y however provide special mass operation functions. See <xref linkend=3D\"b=
atch\"/> for some possible batch operation tricks."
-msgstr ""
-
-#: session_api.xml:663(title) =

+#. Tag: title
+#: session_api.xml:545
+#, no-c-format
 msgid "Modifying detached objects"
 msgstr ""
 =

-#: session_api.xml:665(para) =

+#. Tag: para
+#: session_api.xml:547
+#, no-c-format
 msgid "Many applications need to retrieve an object in one transaction, se=
nd it to the UI layer for manipulation, then save the changes in a new tran=
saction. Applications that use this kind of approach in a high-concurrency =
environment usually use versioned data to ensure isolation for the \"long\"=
 unit of work."
 msgstr ""
 =

-#: session_api.xml:672(para) =

+#. Tag: para
+#: session_api.xml:554
+#, no-c-format
 msgid "Hibernate supports this model by providing for reattachment of deta=
ched instances using the <literal>Session.update()</literal> or <literal>Se=
ssion.merge()</literal> methods:"
 msgstr ""
 =

-#: session_api.xml:690(para) =

+#. Tag: programlisting
+#: session_api.xml:560
+#, no-c-format
+msgid ""
+      "<![CDATA[// in the first session\n"
+      "Cat cat =3D (Cat) firstSession.load(Cat.class, catId);\n"
+      "Cat potentialMate =3D new Cat();\n"
+      "firstSession.save(potentialMate);\n"
+      "\n"
+      "// in a higher layer of the application\n"
+      "cat.setMate(potentialMate);\n"
+      "\n"
+      "// later, in a new session\n"
+      "secondSession.update(cat);  // update cat\n"
+      "secondSession.update(mate); // update mate]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:562
+#, no-c-format
 msgid "If the <literal>Cat</literal> with identifier <literal>catId</liter=
al> had already been loaded by <literal>secondSession</literal> when the ap=
plication tried to reattach it, an exception would have been thrown."
 msgstr ""
 =

-#: session_api.xml:696(para) =

+#. Tag: para
+#: session_api.xml:568
+#, no-c-format
 msgid "Use <literal>update()</literal> if you are sure that the session do=
es not contain an already persistent instance with the same identifier, and=
 <literal>merge()</literal> if you want to merge your modifications at any =
time without consideration of the state of the session. In other words, <li=
teral>update()</literal> is usually the first method you would call in a fr=
esh session, ensuring that reattachment of your detached instances is the f=
irst operation that is executed."
 msgstr ""
 =

-#: session_api.xml:705(para) =

+#. Tag: para
+#: session_api.xml:577
+#, no-c-format
 msgid "The application should individually <literal>update()</literal> det=
ached instances reachable from the given detached instance if and <emphasis=
>only</emphasis> if it wants their state also updated. This can be automate=
d of course, using <emphasis>transitive persistence</emphasis>, see <xref l=
inkend=3D\"objectstate-transitive\"/>."
 msgstr ""
 =

-#: session_api.xml:712(para) =

+#. Tag: para
+#: session_api.xml:584
+#, no-c-format
 msgid "The <literal>lock()</literal> method also allows an application to =
reassociate an object with a new session. However, the detached instance ha=
s to be unmodified!"
 msgstr ""
 =

-#: session_api.xml:724(para) =

+#. Tag: programlisting
+#: session_api.xml:589
+#, no-c-format
+msgid ""
+      "<![CDATA[//just reassociate:\n"
+      "sess.lock(fritz, LockMode.NONE);\n"
+      "//do a version check, then reassociate:\n"
+      "sess.lock(izi, LockMode.READ);\n"
+      "//do a version check, using SELECT ... FOR UPDATE, then reassociate=
:\n"
+      "sess.lock(pk, LockMode.UPGRADE);]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:591
+#, no-c-format
 msgid "Note that <literal>lock()</literal> can be used with various <liter=
al>LockMode</literal>s, see the API documentation and the chapter on transa=
ction handling for more information. Reattachment is not the only usecase f=
or <literal>lock()</literal>."
 msgstr ""
 =

-#: session_api.xml:731(para) =

+#. Tag: para
+#: session_api.xml:598
+#, no-c-format
 msgid "Other models for long units of work are discussed in <xref linkend=
=3D\"transactions-optimistic\"/>."
 msgstr ""
 =

-#: session_api.xml:738(title) =

+#. Tag: title
+#: session_api.xml:605
+#, no-c-format
 msgid "Automatic state detection"
 msgstr ""
 =

-#: session_api.xml:740(para) =

+#. Tag: para
+#: session_api.xml:607
+#, no-c-format
 msgid "Hibernate users have requested a general purpose method that either=
 saves a transient instance by generating a new identifier or updates/reatt=
aches the detached instances associated with its current identifier. The <l=
iteral>saveOrUpdate()</literal> method implements this functionality."
 msgstr ""
 =

-#: session_api.xml:758(para) =

+#. Tag: programlisting
+#: session_api.xml:614
+#, no-c-format
+msgid ""
+      "<![CDATA[// in the first session\n"
+      "Cat cat =3D (Cat) firstSession.load(Cat.class, catID);\n"
+      "\n"
+      "// in a higher tier of the application\n"
+      "Cat mate =3D new Cat();\n"
+      "cat.setMate(mate);\n"
+      "\n"
+      "// later, in a new session\n"
+      "secondSession.saveOrUpdate(cat);   // update existing state (cat ha=
s a non-null id)\n"
+      "secondSession.saveOrUpdate(mate);  // save the new instance (mate h=
as a null id)]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:616
+#, no-c-format
 msgid "The usage and semantics of <literal>saveOrUpdate()</literal> seems =
to be confusing for new users. Firstly, so long as you are not trying to us=
e instances from one session in another new session, you should not need to=
 use <literal>update()</literal>, <literal>saveOrUpdate()</literal>, or <li=
teral>merge()</literal>. Some whole applications will never use either of t=
hese methods."
 msgstr ""
 =

-#: session_api.xml:766(para) =

+#. Tag: para
+#: session_api.xml:624
+#, no-c-format
 msgid "Usually <literal>update()</literal> or <literal>saveOrUpdate()</lit=
eral> are used in the following scenario:"
 msgstr ""
 =

-#: session_api.xml:773(para) =

+#. Tag: para
+#: session_api.xml:631
+#, no-c-format
 msgid "the application loads an object in the first session"
 msgstr ""
 =

-#: session_api.xml:778(para) =

+#. Tag: para
+#: session_api.xml:636
+#, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr ""
 =

-#: session_api.xml:783(para) =

+#. Tag: para
+#: session_api.xml:641
+#, no-c-format
 msgid "some modifications are made to the object"
 msgstr ""
 =

-#: session_api.xml:788(para) =

+#. Tag: para
+#: session_api.xml:646
+#, no-c-format
 msgid "the object is passed back down to the business logic tier"
 msgstr ""
 =

-#: session_api.xml:793(para) =

+#. Tag: para
+#: session_api.xml:651
+#, no-c-format
 msgid "the application persists these modifications by calling <literal>up=
date()</literal> in a second session"
 msgstr ""
 =

-#: session_api.xml:800(para) =

+#. Tag: para
+#: session_api.xml:658
+#, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr ""
 =

-#: session_api.xml:806(para) =

+#. Tag: para
+#: session_api.xml:664
+#, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr ""
 =

-#: session_api.xml:811(para) =

+#. Tag: para
+#: session_api.xml:669
+#, no-c-format
 msgid "if another object associated with the session has the same identifi=
er, throw an exception"
 msgstr ""
 =

-#: session_api.xml:817(para) =

+#. Tag: para
+#: session_api.xml:675
+#, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal>=
 it"
 msgstr ""
 =

-#: session_api.xml:822(para) =

+#. Tag: para
+#: session_api.xml:680
+#, no-c-format
 msgid "if the object's identifier has the value assigned to a newly instan=
tiated object, <literal>save()</literal> it"
 msgstr ""
 =

-#: session_api.xml:828(para) =

+#. Tag: para
+#: session_api.xml:686
+#, no-c-format
 msgid "if the object is versioned (by a <literal>&lt;version&gt;</literal>=
 or <literal>&lt;timestamp&gt;</literal>), and the version property value i=
s the same value assigned to a newly instantiated object, <literal>save()</=
literal> it"
 msgstr ""
 =

-#: session_api.xml:836(para) =

+#. Tag: para
+#: session_api.xml:694
+#, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr ""
 =

-#: session_api.xml:842(para) =

+#. Tag: para
+#: session_api.xml:700
+#, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr ""
 =

-#: session_api.xml:848(para) =

+#. Tag: para
+#: session_api.xml:706
+#, no-c-format
 msgid "if there is a persistent instance with the same identifier currentl=
y associated with the session, copy the state of the given object onto the =
persistent instance"
 msgstr ""
 =

-#: session_api.xml:855(para) =

+#. Tag: para
+#: session_api.xml:713
+#, no-c-format
 msgid "if there is no persistent instance currently associated with the se=
ssion, try to load it from the database, or create a new persistent instanc=
e"
 msgstr ""
 =

-#: session_api.xml:861(para) =

+#. Tag: para
+#: session_api.xml:719
+#, no-c-format
 msgid "the persistent instance is returned"
 msgstr ""
 =

-#: session_api.xml:866(para) =

+#. Tag: para
+#: session_api.xml:724
+#, no-c-format
 msgid "the given instance does not become associated with the session, it =
remains detached"
 msgstr ""
 =

-#: session_api.xml:876(title) =

+#. Tag: title
+#: session_api.xml:734
+#, no-c-format
 msgid "Deleting persistent objects"
 msgstr ""
 =

-#: session_api.xml:878(para) =

+#. Tag: para
+#: session_api.xml:736
+#, no-c-format
 msgid "<literal>Session.delete()</literal> will remove an object's state f=
rom the database. Of course, your application might still hold a reference =
to a deleted object. It's best to think of <literal>delete()</literal> as m=
aking a persistent instance transient."
 msgstr ""
 =

-#: session_api.xml:887(para) =

+#. Tag: programlisting
+#: session_api.xml:743
+#, no-c-format
+msgid "<![CDATA[sess.delete(cat);]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:745
+#, no-c-format
 msgid "You may delete objects in any order you like, without risk of forei=
gn key constraint violations. It is still possible to violate a <literal>NO=
T NULL</literal> constraint on a foreign key column by deleting objects in =
the wrong order, e.g. if you delete the parent, but forget to delete the ch=
ildren."
 msgstr ""
 =

-#: session_api.xml:898(title) =

+#. Tag: title
+#: session_api.xml:756
+#, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr ""
 =

-#: session_api.xml:900(para) =

+#. Tag: para
+#: session_api.xml:758
+#, no-c-format
 msgid "It is occasionally useful to be able to take a graph of persistent =
instances and make them persistent in a different datastore, without regene=
rating identifier values."
 msgstr ""
 =

-#: session_api.xml:920(para) =

+#. Tag: programlisting
+#: session_api.xml:764
+#, no-c-format
+msgid ""
+      "<![CDATA[//retrieve a cat from one database\n"
+      "Session session1 =3D factory1.openSession();\n"
+      "Transaction tx1 =3D session1.beginTransaction();\n"
+      "Cat cat =3D session1.get(Cat.class, catId);\n"
+      "tx1.commit();\n"
+      "session1.close();\n"
+      "\n"
+      "//reconcile with a second database\n"
+      "Session session2 =3D factory2.openSession();\n"
+      "Transaction tx2 =3D session2.beginTransaction();\n"
+      "session2.replicate(cat, ReplicationMode.LATEST_VERSION);\n"
+      "tx2.commit();\n"
+      "session2.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:766
+#, no-c-format
 msgid "The <literal>ReplicationMode</literal> determines how <literal>repl=
icate()</literal> will deal with conflicts with existing rows in the databa=
se."
 msgstr ""
 =

-#: session_api.xml:927(para) =

+#. Tag: para
+#: session_api.xml:773
+#, no-c-format
 msgid "<literal>ReplicationMode.IGNORE</literal> - ignore the object when =
there is an existing database row with the same identifier"
 msgstr ""
 =

-#: session_api.xml:933(para) =

+#. Tag: para
+#: session_api.xml:779
+#, no-c-format
 msgid "<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existi=
ng database row with the same identifier"
 msgstr ""
 =

-#: session_api.xml:939(para) =

+#. Tag: para
+#: session_api.xml:785
+#, no-c-format
 msgid "<literal>ReplicationMode.EXCEPTION</literal> - throw an exception i=
f there is an existing database row with the same identifier"
 msgstr ""
 =

-#: session_api.xml:945(para) =

+#. Tag: para
+#: session_api.xml:791
+#, no-c-format
 msgid "<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the r=
ow if its version number is earlier than the version number of the object, =
or ignore the object otherwise"
 msgstr ""
 =

-#: session_api.xml:953(para) =

+#. Tag: para
+#: session_api.xml:799
+#, no-c-format
 msgid "Usecases for this feature include reconciling data entered into dif=
ferent database instances, upgrading system configuration information durin=
g product upgrades, rolling back changes made during non-ACID transactions =
and more."
 msgstr ""
 =

-#: session_api.xml:962(title) =

+#. Tag: title
+#: session_api.xml:808
+#, no-c-format
 msgid "Flushing the Session"
 msgstr ""
 =

-#: session_api.xml:964(para) =

+#. Tag: para
+#: session_api.xml:810
+#, no-c-format
 msgid "From time to time the <literal>Session</literal> will execute the S=
QL statements needed to synchronize the JDBC connection's state with the st=
ate of objects held in memory. This process, <emphasis>flush</emphasis>, oc=
curs by default at the following points"
 msgstr ""
 =

-#: session_api.xml:973(para) =

+#. Tag: para
+#: session_api.xml:819
+#, no-c-format
 msgid "before some query executions"
 msgstr ""
 =

-#: session_api.xml:978(para) =

+#. Tag: para
+#: session_api.xml:824
+#, no-c-format
 msgid "from <literal>org.hibernate.Transaction.commit()</literal>"
 msgstr ""
 =

-#: session_api.xml:983(para) =

+#. Tag: para
+#: session_api.xml:829
+#, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr ""
 =

-#: session_api.xml:989(para) =

+#. Tag: para
+#: session_api.xml:835
+#, no-c-format
 msgid "The SQL statements are issued in the following order"
 msgstr ""
 =

-#: session_api.xml:995(para) =

+#. Tag: para
+#: session_api.xml:841
+#, no-c-format
 msgid "all entity insertions, in the same order the corresponding objects =
were saved using <literal>Session.save()</literal>"
 msgstr ""
 =

-#: session_api.xml:1001(para) =

+#. Tag: para
+#: session_api.xml:847
+#, no-c-format
 msgid "all entity updates"
 msgstr ""
 =

-#: session_api.xml:1006(para) =

+#. Tag: para
+#: session_api.xml:852
+#, no-c-format
 msgid "all collection deletions"
 msgstr ""
 =

-#: session_api.xml:1011(para) =

+#. Tag: para
+#: session_api.xml:857
+#, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr ""
 =

-#: session_api.xml:1016(para) =

+#. Tag: para
+#: session_api.xml:862
+#, no-c-format
 msgid "all collection insertions"
 msgstr ""
 =

-#: session_api.xml:1021(para) =

+#. Tag: para
+#: session_api.xml:867
+#, no-c-format
 msgid "all entity deletions, in the same order the corresponding objects w=
ere deleted using <literal>Session.delete()</literal>"
 msgstr ""
 =

-#: session_api.xml:1028(para) =

+#. Tag: para
+#: session_api.xml:874
+#, no-c-format
 msgid "(An exception is that objects using <literal>native</literal> ID ge=
neration are inserted when they are saved.)"
 msgstr ""
 =

-#: session_api.xml:1033(para) =

+#. Tag: para
+#: session_api.xml:879
+#, no-c-format
 msgid "Except when you explicity <literal>flush()</literal>, there are abs=
olutely no guarantees about <emphasis>when</emphasis> the <literal>Session<=
/literal> executes the JDBC calls, only the <emphasis>order</emphasis> in w=
hich they are executed. However, Hibernate does guarantee that the <literal=
>Query.list(..)</literal> will never return stale data; nor will they retur=
n the wrong data."
 msgstr ""
 =

-#: session_api.xml:1041(para) =

+#. Tag: para
+#: session_api.xml:887
+#, no-c-format
 msgid "It is possible to change the default behavior so that flush occurs =
less frequently. The <literal>FlushMode</literal> class defines three diffe=
rent modes: only flush at commit time (and only when the Hibernate <literal=
>Transaction</literal> API is used), flush automatically using the explaine=
d routine, or never flush unless <literal>flush()</literal> is called expli=
citly. The last mode is useful for long running units of work, where a <lit=
eral>Session</literal> is kept open and disconnected for a long time (see <=
xref linkend=3D\"transactions-optimistic-longsession\"/>)."
 msgstr ""
 =

-#: session_api.xml:1066(para) =

+#. Tag: programlisting
+#: session_api.xml:897
+#, no-c-format
+msgid ""
+      "<![CDATA[sess =3D sf.openSession();\n"
+      "Transaction tx =3D sess.beginTransaction();\n"
+      "sess.setFlushMode(FlushMode.COMMIT); // allow queries to return sta=
le state\n"
+      "\n"
+      "Cat izi =3D (Cat) sess.load(Cat.class, id);\n"
+      "izi.setName(iznizi);\n"
+      "\n"
+      "// might return stale data\n"
+      "sess.find(\"from Cat as cat left outer join cat.kittens kitten\");\=
n"
+      "\n"
+      "// change to izi is not flushed!\n"
+      "...\n"
+      "tx.commit(); // flush occurs\n"
+      "sess.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:899
+#, no-c-format
 msgid "During flush, an exception might occur (e.g. if a DML operation vio=
lates a constraint). Since handling exceptions involves some understanding =
of Hibernate's transactional behavior, we discuss it in <xref linkend=3D\"t=
ransactions\"/>."
 msgstr ""
 =

-#: session_api.xml:1075(title) =

+#. Tag: title
+#: session_api.xml:908
+#, no-c-format
 msgid "Transitive persistence"
 msgstr ""
 =

-#: session_api.xml:1077(para) =

+#. Tag: para
+#: session_api.xml:910
+#, no-c-format
 msgid "It is quite cumbersome to save, delete, or reattach individual obje=
cts, especially if you deal with a graph of associated objects. A common ca=
se is a parent/child relationship. Consider the following example:"
 msgstr ""
 =

-#: session_api.xml:1083(para) =

+#. Tag: para
+#: session_api.xml:916
+#, no-c-format
 msgid "If the children in a parent/child relationship would be value typed=
 (e.g. a collection of addresses or strings), their life cycle would depend=
 on the parent and no further action would be required for convenient \"cas=
cading\" of state changes. When the parent is saved, the value-typed child =
objects are saved as well, when the parent is deleted, the children will be=
 deleted, etc. This even works for operations such as the removal of a chil=
d from the collection; Hibernate will detect this and, since value-typed ob=
jects can't have shared references, delete the child from the database."
 msgstr ""
 =

-#: session_api.xml:1094(para) =

+#. Tag: para
+#: session_api.xml:927
+#, no-c-format
 msgid "Now consider the same scenario with parent and child objects being =
entities, not value-types (e.g. categories and items, or parent and child c=
ats). Entities have their own life cycle, support shared references (so rem=
oving an entity from the collection does not mean it can be deleted), and t=
here is by default no cascading of state from one entity to any other assoc=
iated entities. Hibernate does not implement <emphasis>persistence by reach=
ability</emphasis> by default."
 msgstr ""
 =

-#: session_api.xml:1103(para) =

+#. Tag: para
+#: session_api.xml:936
+#, no-c-format
 msgid "For each basic operation of the Hibernate session - including <lite=
ral>persist(), merge(), saveOrUpdate(), delete(), lock(), refresh(), evict(=
), replicate()</literal> - there is a corresponding cascade style. Respecti=
vely, the cascade styles are named <literal>create, merge, save-update, del=
ete, lock, refresh, evict, replicate</literal>. If you want an operation to=
 be cascaded along an association, you must indicate that in the mapping do=
cument. For example:"
 msgstr ""
 =

-#: session_api.xml:1114(para) =

+#. Tag: programlisting
+#: session_api.xml:945
+#, no-c-format
+msgid "<![CDATA[<one-to-one name=3D\"person\" cascade=3D\"persist\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:947
+#, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr ""
 =

-#: session_api.xml:1120(para) =

+#. Tag: programlisting
+#: session_api.xml:951
+#, no-c-format
+msgid "<![CDATA[<one-to-one name=3D\"person\" cascade=3D\"persist,delete,l=
ock\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: session_api.xml:953
+#, no-c-format
 msgid "You may even use <literal>cascade=3D\"all\"</literal> to specify th=
at <emphasis>all</emphasis> operations should be cascaded along the associa=
tion. The default <literal>cascade=3D\"none\"</literal> specifies that no o=
perations are to be cascaded."
 msgstr ""
 =

-#: session_api.xml:1126(para) =

+#. Tag: para
+#: session_api.xml:959
+#, no-c-format
 msgid "A special cascade style, <literal>delete-orphan</literal>, applies =
only to one-to-many associations, and indicates that the <literal>delete()<=
/literal> operation should be applied to any child object that is removed f=
rom the association."
 msgstr ""
 =

-#: session_api.xml:1133(para) =

+#. Tag: para
+#: session_api.xml:966
+#, no-c-format
 msgid "Recommendations:"
 msgstr ""
 =

-#: session_api.xml:1139(para) =

+#. Tag: para
+#: session_api.xml:972
+#, no-c-format
 msgid "It doesn't usually make sense to enable cascade on a <literal>&lt;m=
any-to-one&gt;</literal> or <literal>&lt;many-to-many&gt;</literal> associa=
tion. Cascade is often useful for <literal>&lt;one-to-one&gt;</literal> and=
 <literal>&lt;one-to-many&gt;</literal> associations."
 msgstr ""
 =

-#: session_api.xml:1147(para) =

+#. Tag: para
+#: session_api.xml:980
+#, no-c-format
 msgid "If the child object's lifespan is bounded by the lifespan of the pa=
rent object, make it a <emphasis>life cycle object</emphasis> by specifying=
 <literal>cascade=3D\"all,delete-orphan\"</literal>."
 msgstr ""
 =

-#: session_api.xml:1154(para) =

+#. Tag: para
+#: session_api.xml:987
+#, no-c-format
 msgid "Otherwise, you might not need cascade at all. But if you think that=
 you will often be working with the parent and children together in the sam=
e transaction, and you want to save yourself some typing, consider using <l=
iteral>cascade=3D\"persist,merge,save-update\"</literal>."
 msgstr ""
 =

-#: session_api.xml:1162(para) =

+#. Tag: para
+#: session_api.xml:995
+#, no-c-format
 msgid "Mapping an association (either a single valued association, or a co=
llection) with <literal>cascade=3D\"all\"</literal> marks the association a=
s a <emphasis>parent/child</emphasis> style relationship where save/update/=
delete of the parent results in save/update/delete of the child or children=
."
 msgstr ""
 =

-#: session_api.xml:1168(para) =

+#. Tag: para
+#: session_api.xml:1001
+#, no-c-format
 msgid "Futhermore, a mere reference to a child from a persistent parent wi=
ll result in save/update of the child. This metaphor is incomplete, however=
. A child which becomes unreferenced by its parent is <emphasis>not</emphas=
is> automatically deleted, except in the case of a <literal>&lt;one-to-many=
&gt;</literal> association mapped with <literal>cascade=3D\"delete-orphan\"=
</literal>. The precise semantics of cascading operations for a parent/chil=
d relationship are as follows:"
 msgstr ""
 =

-#: session_api.xml:1179(para) =

+#. Tag: para
+#: session_api.xml:1012
+#, no-c-format
 msgid "If a parent is passed to <literal>persist()</literal>, all children=
 are passed to <literal>persist()</literal>"
 msgstr ""
 =

-#: session_api.xml:1185(para) =

+#. Tag: para
+#: session_api.xml:1018
+#, no-c-format
 msgid "If a parent is passed to <literal>merge()</literal>, all children a=
re passed to <literal>merge()</literal>"
 msgstr ""
 =

-#: session_api.xml:1191(para) =

+#. Tag: para
+#: session_api.xml:1024
+#, no-c-format
 msgid "If a parent is passed to <literal>save()</literal>, <literal>update=
()</literal> or <literal>saveOrUpdate()</literal>, all children are passed =
to <literal>saveOrUpdate()</literal>"
 msgstr ""
 =

-#: session_api.xml:1197(para) =

+#. Tag: para
+#: session_api.xml:1030
+#, no-c-format
 msgid "If a transient or detached child becomes referenced by a persistent=
 parent, it is passed to <literal>saveOrUpdate()</literal>"
 msgstr ""
 =

-#: session_api.xml:1203(para) =

+#. Tag: para
+#: session_api.xml:1036
+#, no-c-format
 msgid "If a parent is deleted, all children are passed to <literal>delete(=
)</literal>"
 msgstr ""
 =

-#: session_api.xml:1208(para) =

+#. Tag: para
+#: session_api.xml:1041
+#, no-c-format
 msgid "If a child is dereferenced by a persistent parent, <emphasis>nothin=
g special happens</emphasis> - the application should explicitly delete the=
 child if necessary - unless <literal>cascade=3D\"delete-orphan\"</literal>=
, in which case the \"orphaned\" child is deleted."
 msgstr ""
 =

-#: session_api.xml:1217(para) =

+#. Tag: para
+#: session_api.xml:1050
+#, no-c-format
 msgid "Finally, note that cascading of operations can be applied to an obj=
ect graph at <emphasis>call time</emphasis> or at <emphasis>flush time</emp=
hasis>. All operations, if enabled, are cascaded to associated entities rea=
chable when the operation is executed. However, <literal>save-upate</litera=
l> and <literal>delete-orphan</literal> are transitive for all associated e=
ntities reachable during flush of the <literal>Session</literal>."
 msgstr ""
 =

-#: session_api.xml:1229(title) =

+#. Tag: title
+#: session_api.xml:1062
+#, no-c-format
 msgid "Using metadata"
 msgstr ""
 =

-#: session_api.xml:1231(para) =

+#. Tag: para
+#: session_api.xml:1064
+#, no-c-format
 msgid "Hibernate requires a very rich meta-level model of all entity and v=
alue types. From time to time, this model is very useful to the application=
 itself. For example, the application might use Hibernate's metadata to imp=
lement a \"smart\" deep-copy algorithm that understands which objects shoul=
d be copied (eg. mutable value types) and which should not (eg. immutable v=
alue types and, possibly, associated entities)."
 msgstr ""
 =

-#: session_api.xml:1238(para) =

+#. Tag: para
+#: session_api.xml:1071
+#, no-c-format
 msgid "Hibernate exposes metadata via the <literal>ClassMetadata</literal>=
 and <literal>CollectionMetadata</literal> interfaces and the <literal>Type=
</literal> hierarchy. Instances of the metadata interfaces may be obtained =
from the <literal>SessionFactory</literal>."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: session_api.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: session_api.xml:1078
+#, no-c-format
+msgid ""
+      "<![CDATA[Cat fritz =3D ......;\n"
+      "ClassMetadata catMeta =3D sessionfactory.getClassMetadata(Cat.class=
);\n"
+      "\n"
+      "Object[] propertyValues =3D catMeta.getPropertyValues(fritz);\n"
+      "String[] propertyNames =3D catMeta.getPropertyNames();\n"
+      "Type[] propertyTypes =3D catMeta.getPropertyTypes();\n"
+      "\n"
+      "// get a Map of all properties which are not collections or associa=
tions\n"
+      "Map namedValues =3D new HashMap();\n"
+      "for ( int i=3D0; i<propertyNames.length; i++ ) {\n"
+      "    if ( !propertyTypes[i].isEntityType() && !propertyTypes[i].isCo=
llectionType() ) {\n"
+      "        namedValues.put( propertyNames[i], propertyValues[i] );\n"
+      "    }\n"
+      "}]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/tool=
set_guide.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_gu=
ide.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_gu=
ide.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,548 +1,950 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:34-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: toolset_guide.xml:5(title) =

+#. Tag: title
+#: toolset_guide.xml:29
+#, no-c-format
 msgid "Toolset Guide"
 msgstr ""
 =

-#: toolset_guide.xml:7(para) =

+#. Tag: para
+#: toolset_guide.xml:31
+#, no-c-format
 msgid "Roundtrip engineering with Hibernate is possible using a set of Ecl=
ipse plugins, commandline tools, as well as Ant tasks."
 msgstr ""
 =

-#: toolset_guide.xml:12(para) =

+#. Tag: para
+#: toolset_guide.xml:36
+#, no-c-format
 msgid "The <emphasis>Hibernate Tools</emphasis> currently include plugins =
for the Eclipse IDE as well as Ant tasks for reverse engineering of existin=
g databases:"
 msgstr ""
 =

-#: toolset_guide.xml:18(para) =

+#. Tag: para
+#: toolset_guide.xml:42
+#, no-c-format
 msgid "<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML ma=
pping files, supporting auto-completion and syntax highlighting. It also su=
pports semantic auto-completion for class names and property/field names, m=
aking it much more versatile than a normal XML editor."
 msgstr ""
 =

-#: toolset_guide.xml:23(para) =

+#. Tag: para
+#: toolset_guide.xml:47
+#, no-c-format
 msgid "<emphasis>Console:</emphasis> The console is a new view in Eclipse.=
 In addition to a tree overview of your console configurations, you also ge=
t an interactive view of your persistent classes and their relationships. T=
he console allows you to execute HQL queries against your database and brow=
se the result directly in Eclipse."
 msgstr ""
 =

-#: toolset_guide.xml:30(para) =

+#. Tag: para
+#: toolset_guide.xml:54
+#, no-c-format
 msgid "<emphasis>Development Wizards:</emphasis> Several wizards are provi=
ded with the Hibernate Eclipse tools; you can use a wizard to quickly gener=
ate Hibernate configuration (cfg.xml) files, or you may even completely rev=
erse engineer an existing database schema into POJO source files and Hibern=
ate mapping files. The reverse engineering wizard supports customizable tem=
plates."
 msgstr ""
 =

-#: toolset_guide.xml:38(emphasis) =

+#. Tag: emphasis
+#: toolset_guide.xml:62
+#, no-c-format
 msgid "Ant Tasks:"
 msgstr ""
 =

-#: toolset_guide.xml:43(para) =

+#. Tag: para
+#: toolset_guide.xml:67
+#, no-c-format
 msgid "Please refer to the <emphasis>Hibernate Tools</emphasis> package an=
d it's documentation for more information."
 msgstr ""
 =

-#: toolset_guide.xml:48(para) =

+#. Tag: para
+#: toolset_guide.xml:72
+#, no-c-format
 msgid "However, the Hibernate main package comes bundled with an integrate=
d tool (it can even be used from \"inside\" Hibernate on-the-fly): <emphasi=
s>SchemaExport</emphasis> aka <literal>hbm2ddl</literal>."
 msgstr ""
 =

-#: toolset_guide.xml:55(title) =

+#. Tag: title
+#: toolset_guide.xml:79
+#, no-c-format
 msgid "Automatic schema generation"
 msgstr ""
 =

-#: toolset_guide.xml:57(para) =

+#. Tag: para
+#: toolset_guide.xml:81
+#, no-c-format
 msgid "DDL may be generated from your mapping files by a Hibernate utility=
. The generated schema includes referential integrity constraints (primary =
and foreign keys) for entity and collection tables. Tables and sequences ar=
e also created for mapped identifier generators."
 msgstr ""
 =

-#: toolset_guide.xml:64(para) =

+#. Tag: para
+#: toolset_guide.xml:88
+#, no-c-format
 msgid "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</liter=
al> via the <literal>hibernate.dialect</literal> property when using this t=
ool, as DDL is highly vendor specific."
 msgstr ""
 =

-#: toolset_guide.xml:70(para) =

+#. Tag: para
+#: toolset_guide.xml:94
+#, no-c-format
 msgid "First, customize your mapping files to improve the generated schema=
."
 msgstr ""
 =

-#: toolset_guide.xml:75(title) =

+#. Tag: title
+#: toolset_guide.xml:99
+#, no-c-format
 msgid "Customizing the schema"
 msgstr ""
 =

-#: toolset_guide.xml:77(para) =

+#. Tag: para
+#: toolset_guide.xml:101
+#, no-c-format
 msgid "Many Hibernate mapping elements define optional attributes named <l=
iteral>length</literal>, <literal>precision</literal> and <literal>scale</l=
iteral>. You may set the length, precision and scale of a column with this =
attribute."
 msgstr ""
 =

-#: toolset_guide.xml:87(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:108
+#, no-c-format
+msgid "<![CDATA[<property name=3D\"zip\" length=3D\"5\"/>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: toolset_guide.xml:109
+#, no-c-format
+msgid "<![CDATA[<property name=3D\"balance\" precision=3D\"12\" scale=3D\"=
2\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:111
+#, no-c-format
 msgid "Some tags also accept a <literal>not-null</literal> attribute (for =
generating a <literal>NOT NULL</literal> constraint on table columns) and a=
 <literal>unique</literal> attribute (for generating <literal>UNIQUE</liter=
al> constraint on table columns)."
 msgstr ""
 =

-#: toolset_guide.xml:97(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:117
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"bar\" column=3D\"barId\" not-null=3D=
\"true\"/>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: toolset_guide.xml:119
+#, no-c-format
+msgid "<![CDATA[<element column=3D\"serialNumber\" type=3D\"long\" not-nul=
l=3D\"true\" unique=3D\"true\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:121
+#, no-c-format
 msgid "A <literal>unique-key</literal> attribute may be used to group colu=
mns in a single unique key constraint. Currently, the specified value of th=
e <literal>unique-key</literal> attribute is <emphasis>not</emphasis> used =
to name the constraint in the generated DDL, only to group the columns in t=
he mapping file."
 msgstr ""
 =

-#: toolset_guide.xml:108(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:129
+#, no-c-format
+msgid ""
+      "<![CDATA[<many-to-one name=3D\"org\" column=3D\"orgId\" unique-key=
=3D\"OrgEmployeeId\"/>\n"
+      "<property name=3D\"employeeId\" unique-key=3D\"OrgEmployee\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:131
+#, no-c-format
 msgid "An <literal>index</literal> attribute specifies the name of an inde=
x that will be created using the mapped column or columns. Multiple columns=
 may be grouped into the same index, simply by specifying the same index na=
me."
 msgstr ""
 =

-#: toolset_guide.xml:117(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:137
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"lastName\" index=3D\"CustName\"/>\n"
+      "<property name=3D\"firstName\" index=3D\"CustName\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:139
+#, no-c-format
 msgid "A <literal>foreign-key</literal> attribute may be used to override =
the name of any generated foreign key constraint."
 msgstr ""
 =

-#: toolset_guide.xml:124(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:144
+#, no-c-format
+msgid "<![CDATA[<many-to-one name=3D\"bar\" column=3D\"barId\" foreign-key=
=3D\"FKFooBar\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:146
+#, no-c-format
 msgid "Many mapping elements also accept a child <literal>&lt;column&gt;</=
literal> element. This is particularly useful for mapping multi-column type=
s:"
 msgstr ""
 =

-#: toolset_guide.xml:135(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:151
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"name\" type=3D\"my.customtypes.Name\"/>=
\n"
+      "    <column name=3D\"last\" not-null=3D\"true\" index=3D\"bar_idx\"=
 length=3D\"30\"/>\n"
+      "    <column name=3D\"first\" not-null=3D\"true\" index=3D\"bar_idx\=
" length=3D\"20\"/>\n"
+      "    <column name=3D\"initial\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:153
+#, no-c-format
 msgid "The <literal>default</literal> attribute lets you specify a default=
 value for a column (you should assign the same value to the mapped propert=
y before saving a new instance of the mapped class)."
 msgstr ""
 =

-#: toolset_guide.xml:149(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:159
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"credits\" type=3D\"integer\" insert=3D\=
"false\">\n"
+      "    <column name=3D\"credits\" default=3D\"10\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: toolset_guide.xml:161
+#, no-c-format
+msgid ""
+      "<![CDATA[<version name=3D\"version\" type=3D\"integer\" insert=3D\"=
false\">\n"
+      "    <column name=3D\"version\" default=3D\"0\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:163
+#, no-c-format
 msgid "The <literal>sql-type</literal> attribute allows the user to overri=
de the default mapping of a Hibernate type to SQL datatype."
 msgstr ""
 =

-#: toolset_guide.xml:158(para) =

+#. Tag: programlisting
+#: toolset_guide.xml:168
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"balance\" type=3D\"float\">\n"
+      "    <column name=3D\"balance\" sql-type=3D\"decimal(13,3)\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: para
+#: toolset_guide.xml:170
+#, no-c-format
 msgid "The <literal>check</literal> attribute allows you to specify a chec=
k constraint."
 msgstr ""
 =

-#: toolset_guide.xml:173(title) =

+#. Tag: programlisting
+#: toolset_guide.xml:174
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"foo\" type=3D\"integer\">\n"
+      "    <column name=3D\"foo\" check=3D\"foo > 10\"/>\n"
+      "</property>]]>"
+msgstr ""
+
+#. Tag: programlisting
+#: toolset_guide.xml:176
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Foo\" table=3D\"foos\" check=3D\"bar < 100=
.0\">\n"
+      "    ...\n"
+      "    <property name=3D\"bar\" type=3D\"float\"/>\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:180
+#, no-c-format
 msgid "Summary"
 msgstr ""
 =

-#: toolset_guide.xml:180(entry) =

+#. Tag: entry
+#: toolset_guide.xml:187
+#, no-c-format
 msgid "Attribute"
 msgstr ""
 =

-#: toolset_guide.xml:181(entry) =

+#. Tag: entry
+#: toolset_guide.xml:188
+#, no-c-format
 msgid "Values"
 msgstr ""
 =

-#: toolset_guide.xml:182(entry) =

+#. Tag: entry
+#: toolset_guide.xml:189
+#, no-c-format
 msgid "Interpretation"
 msgstr ""
 =

-#: toolset_guide.xml:187(literal) =

+#. Tag: literal
+#: toolset_guide.xml:194
+#, no-c-format
 msgid "length"
 msgstr ""
 =

-#: toolset_guide.xml:188(entry) toolset_guide.xml:193(entry) toolset_guide=
.xml:198(entry) =

+#. Tag: entry
+#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
+#, no-c-format
 msgid "number"
 msgstr ""
 =

-#: toolset_guide.xml:189(entry) =

+#. Tag: entry
+#: toolset_guide.xml:196
+#, no-c-format
 msgid "column length"
 msgstr ""
 =

-#: toolset_guide.xml:192(literal) =

+#. Tag: literal
+#: toolset_guide.xml:199
+#, no-c-format
 msgid "precision"
 msgstr ""
 =

-#: toolset_guide.xml:194(entry) =

+#. Tag: entry
+#: toolset_guide.xml:201
+#, no-c-format
 msgid "column decimal precision"
 msgstr ""
 =

-#: toolset_guide.xml:197(literal) =

+#. Tag: literal
+#: toolset_guide.xml:204
+#, no-c-format
 msgid "scale"
 msgstr ""
 =

-#: toolset_guide.xml:199(entry) =

+#. Tag: entry
+#: toolset_guide.xml:206
+#, no-c-format
 msgid "column decimal scale"
 msgstr ""
 =

-#: toolset_guide.xml:202(literal) =

+#. Tag: literal
+#: toolset_guide.xml:209
+#, no-c-format
 msgid "not-null"
 msgstr ""
 =

-#: toolset_guide.xml:203(literal) toolset_guide.xml:208(literal) =

+#. Tag: literal
+#: toolset_guide.xml:210 toolset_guide.xml:215
+#, no-c-format
 msgid "true|false"
 msgstr ""
 =

-#: toolset_guide.xml:204(entry) =

+#. Tag: entry
+#: toolset_guide.xml:211
+#, no-c-format
 msgid "specfies that the column should be non-nullable"
 msgstr ""
 =

-#: toolset_guide.xml:207(literal) =

+#. Tag: literal
+#: toolset_guide.xml:214
+#, no-c-format
 msgid "unique"
 msgstr ""
 =

-#: toolset_guide.xml:209(entry) =

+#. Tag: entry
+#: toolset_guide.xml:216
+#, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr ""
 =

-#: toolset_guide.xml:212(literal) =

+#. Tag: literal
+#: toolset_guide.xml:219
+#, no-c-format
 msgid "index"
 msgstr ""
 =

-#: toolset_guide.xml:213(literal) =

+#. Tag: literal
+#: toolset_guide.xml:220
+#, no-c-format
 msgid "index_name"
 msgstr ""
 =

-#: toolset_guide.xml:214(entry) =

+#. Tag: entry
+#: toolset_guide.xml:221
+#, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr ""
 =

-#: toolset_guide.xml:217(literal) =

+#. Tag: literal
+#: toolset_guide.xml:224
+#, no-c-format
 msgid "unique-key"
 msgstr ""
 =

-#: toolset_guide.xml:218(literal) =

+#. Tag: literal
+#: toolset_guide.xml:225
+#, no-c-format
 msgid "unique_key_name"
 msgstr ""
 =

-#: toolset_guide.xml:219(entry) =

+#. Tag: entry
+#: toolset_guide.xml:226
+#, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr ""
 =

-#: toolset_guide.xml:222(literal) =

+#. Tag: literal
+#: toolset_guide.xml:229
+#, no-c-format
 msgid "foreign-key"
 msgstr ""
 =

-#: toolset_guide.xml:223(literal) =

+#. Tag: literal
+#: toolset_guide.xml:230
+#, no-c-format
 msgid "foreign_key_name"
 msgstr ""
 =

-#: toolset_guide.xml:226(literal) =

-msgid "&lt;one-to-one&gt;"
+#. Tag: entry
+#: toolset_guide.xml:231
+#, no-c-format
+msgid "specifies the name of the foreign key constraint generated for an a=
ssociation, for a <literal>&lt;one-to-one&gt;</literal>, <literal>&lt;many-=
to-one&gt;</literal>, <literal>&lt;key&gt;</literal>, or <literal>&lt;many-=
to-many&gt;</literal> mapping element. Note that <literal>inverse=3D\"true\=
"</literal> sides will not be considered by <literal>SchemaExport</literal>=
."
 msgstr ""
 =

-#: toolset_guide.xml:227(literal) =

-msgid "&lt;many-to-one&gt;"
-msgstr ""
-
-#: toolset_guide.xml:227(literal) =

-msgid "&lt;key&gt;"
-msgstr ""
-
-#: toolset_guide.xml:228(literal) =

-msgid "&lt;many-to-many&gt;"
-msgstr ""
-
-#: toolset_guide.xml:229(literal) =

-msgid "inverse=3D\"true\""
-msgstr ""
-
-#: toolset_guide.xml:230(literal) =

-msgid "SchemaExport"
-msgstr ""
-
-#: toolset_guide.xml:224(entry) =

-msgid "specifies the name of the foreign key constraint generated for an a=
ssociation, for a <placeholder-1/>, <placeholder-2/>, <placeholder-3/>, or =
<placeholder-4/> mapping element. Note that <placeholder-5/> sides will not=
 be considered by <placeholder-6/>."
-msgstr ""
-
-#: toolset_guide.xml:234(literal) =

+#. Tag: literal
+#: toolset_guide.xml:241
+#, no-c-format
 msgid "sql-type"
 msgstr ""
 =

-#: toolset_guide.xml:235(literal) =

+#. Tag: literal
+#: toolset_guide.xml:242
+#, no-c-format
 msgid "SQL column type"
 msgstr ""
 =

-#: toolset_guide.xml:238(literal) =

-msgid "&lt;column&gt;"
+#. Tag: entry
+#: toolset_guide.xml:243
+#, no-c-format
+msgid "overrides the default column type (attribute of <literal>&lt;column=
&gt;</literal> element only)"
 msgstr ""
 =

-#: toolset_guide.xml:236(entry) =

-msgid "overrides the default column type (attribute of <placeholder-1/> el=
ement only)"
-msgstr ""
-
-#: toolset_guide.xml:242(literal) =

+#. Tag: literal
+#: toolset_guide.xml:249
+#, no-c-format
 msgid "default"
 msgstr ""
 =

-#: toolset_guide.xml:243(entry) toolset_guide.xml:250(entry) =

+#. Tag: entry
+#: toolset_guide.xml:250 toolset_guide.xml:257
+#, no-c-format
 msgid "SQL expression"
 msgstr ""
 =

-#: toolset_guide.xml:244(entry) =

+#. Tag: entry
+#: toolset_guide.xml:251
+#, no-c-format
 msgid "specify a default value for the column"
 msgstr ""
 =

-#: toolset_guide.xml:249(literal) =

+#. Tag: literal
+#: toolset_guide.xml:256
+#, no-c-format
 msgid "check"
 msgstr ""
 =

-#: toolset_guide.xml:251(entry) =

+#. Tag: entry
+#: toolset_guide.xml:258
+#, no-c-format
 msgid "create an SQL check constraint on either column or table"
 msgstr ""
 =

-#: toolset_guide.xml:259(para) =

+#. Tag: para
+#: toolset_guide.xml:266
+#, no-c-format
 msgid "The <literal>&lt;comment&gt;</literal> element allows you to specif=
y comments for the generated schema."
 msgstr ""
 =

-#: toolset_guide.xml:275(para) =

-msgid "This results in a <literal>comment on table</literal> or <literal>c=
omment on column</literal> statement in the generated DDL (where supported)=
."
+#. Tag: programlisting
+#: toolset_guide.xml:271
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Customer\" table=3D\"CurCust\">\n"
+      "    <comment>Current customers only</comment>\n"
+      "    ...\n"
+      "</class>]]>"
 msgstr ""
 =

-#: toolset_guide.xml:284(title) =

-msgid "Running the tool"
+#. Tag: programlisting
+#: toolset_guide.xml:273
+#, no-c-format
+msgid ""
+      "<![CDATA[<property name=3D\"balance\">\n"
+      "    <column name=3D\"bal\">\n"
+      "        <comment>Balance in USD</comment>\n"
+      "    </column>\n"
+      "</property>]]>"
 msgstr ""
 =

-#: toolset_guide.xml:286(para) =

-msgid "The <literal>SchemaExport</literal> tool writes a DDL script to sta=
ndard out and/or executes the DDL statements."
+#. Tag: para
+#: toolset_guide.xml:275
+#, no-c-format
+msgid "This results in a <literal>comment on table</literal> or <literal>c=
omment on column</literal> statement in the generated DDL (where supported)=
."
 msgstr ""
 =

-#: toolset_guide.xml:292(literal) toolset_guide.xml:459(literal) toolset_g=
uide.xml:541(literal) =

-msgid "java -cp"
+#. Tag: title
+#: toolset_guide.xml:284
+#, no-c-format
+msgid "Running the tool"
 msgstr ""
 =

-#: toolset_guide.xml:292(emphasis) toolset_guide.xml:459(emphasis) toolset=
_guide.xml:541(emphasis) =

-msgid "hibernate_classpaths"
+#. Tag: para
+#: toolset_guide.xml:286
+#, no-c-format
+msgid "The <literal>SchemaExport</literal> tool writes a DDL script to sta=
ndard out and/or executes the DDL statements."
 msgstr ""
 =

-#: toolset_guide.xml:293(literal) =

-msgid "org.hibernate.tool.hbm2ddl.SchemaExport"
+#. Tag: para
+#: toolset_guide.xml:291
+#, no-c-format
+msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasi=
s> <literal>org.hibernate.tool.hbm2ddl.SchemaExport</literal> <emphasis>opt=
ions mapping_files</emphasis>"
 msgstr ""
 =

-#: toolset_guide.xml:293(emphasis) toolset_guide.xml:460(emphasis) toolset=
_guide.xml:542(emphasis) =

-msgid "options mapping_files"
-msgstr ""
-
-#: toolset_guide.xml:297(title) =

+#. Tag: title
+#: toolset_guide.xml:297
+#, no-c-format
 msgid "<literal>SchemaExport</literal> Command Line Options"
 msgstr ""
 =

-#: toolset_guide.xml:303(entry) toolset_guide.xml:470(entry) toolset_guide=
.xml:552(entry) =

+#. Tag: entry
+#: toolset_guide.xml:303 toolset_guide.xml:453 toolset_guide.xml:522
+#, no-c-format
 msgid "Option"
 msgstr ""
 =

-#: toolset_guide.xml:304(entry) toolset_guide.xml:392(entry) toolset_guide=
.xml:471(entry) toolset_guide.xml:553(entry) =

+#. Tag: entry
+#: toolset_guide.xml:304 toolset_guide.xml:391 toolset_guide.xml:454 tools=
et_guide.xml:523
+#, no-c-format
 msgid "Description"
 msgstr ""
 =

-#: toolset_guide.xml:309(literal) toolset_guide.xml:476(literal) =

+#. Tag: literal
+#: toolset_guide.xml:309 toolset_guide.xml:459
+#, no-c-format
 msgid "--quiet"
 msgstr ""
 =

-#: toolset_guide.xml:310(entry) toolset_guide.xml:477(entry) =

+#. Tag: entry
+#: toolset_guide.xml:310 toolset_guide.xml:460
+#, no-c-format
 msgid "don't output the script to stdout"
 msgstr ""
 =

-#: toolset_guide.xml:313(literal) =

+#. Tag: literal
+#: toolset_guide.xml:313
+#, no-c-format
 msgid "--drop"
 msgstr ""
 =

-#: toolset_guide.xml:314(entry) =

+#. Tag: entry
+#: toolset_guide.xml:314
+#, no-c-format
 msgid "only drop the tables"
 msgstr ""
 =

-#: toolset_guide.xml:317(literal) =

+#. Tag: literal
+#: toolset_guide.xml:317
+#, no-c-format
 msgid "--create"
 msgstr ""
 =

-#: toolset_guide.xml:318(entry) =

+#. Tag: entry
+#: toolset_guide.xml:318
+#, no-c-format
 msgid "only create the tables"
 msgstr ""
 =

-#: toolset_guide.xml:321(literal) toolset_guide.xml:480(literal) =

+#. Tag: literal
+#: toolset_guide.xml:321 toolset_guide.xml:463
+#, no-c-format
 msgid "--text"
 msgstr ""
 =

-#: toolset_guide.xml:322(entry) =

+#. Tag: entry
+#: toolset_guide.xml:322
+#, no-c-format
 msgid "don't export to the database"
 msgstr ""
 =

-#: toolset_guide.xml:325(literal) =

+#. Tag: literal
+#: toolset_guide.xml:325
+#, no-c-format
 msgid "--output=3Dmy_schema.ddl"
 msgstr ""
 =

-#: toolset_guide.xml:326(entry) =

+#. Tag: entry
+#: toolset_guide.xml:326
+#, no-c-format
 msgid "output the ddl script to a file"
 msgstr ""
 =

-#: toolset_guide.xml:329(literal) toolset_guide.xml:484(literal) toolset_g=
uide.xml:558(literal) =

+#. Tag: literal
+#: toolset_guide.xml:329 toolset_guide.xml:467 toolset_guide.xml:528
+#, no-c-format
 msgid "--naming=3Deg.MyNamingStrategy"
 msgstr ""
 =

-#: toolset_guide.xml:330(literal) toolset_guide.xml:485(literal) toolset_g=
uide.xml:559(literal) =

-msgid "NamingStrategy"
+#. Tag: entry
+#: toolset_guide.xml:330 toolset_guide.xml:468 toolset_guide.xml:529
+#, no-c-format
+msgid "select a <literal>NamingStrategy</literal>"
 msgstr ""
 =

-#: toolset_guide.xml:330(entry) toolset_guide.xml:485(entry) toolset_guide=
.xml:559(entry) =

-msgid "select a <placeholder-1/>"
-msgstr ""
-
-#: toolset_guide.xml:333(literal) toolset_guide.xml:492(literal) toolset_g=
uide.xml:566(literal) =

+#. Tag: literal
+#: toolset_guide.xml:333 toolset_guide.xml:475 toolset_guide.xml:536
+#, no-c-format
 msgid "--config=3Dhibernate.cfg.xml"
 msgstr ""
 =

-#: toolset_guide.xml:334(entry) =

+#. Tag: entry
+#: toolset_guide.xml:334
+#, no-c-format
 msgid "read Hibernate configuration from an XML file"
 msgstr ""
 =

-#: toolset_guide.xml:337(literal) toolset_guide.xml:488(literal) toolset_g=
uide.xml:562(literal) =

+#. Tag: literal
+#: toolset_guide.xml:337 toolset_guide.xml:471 toolset_guide.xml:532
+#, no-c-format
 msgid "--properties=3Dhibernate.properties"
 msgstr ""
 =

-#: toolset_guide.xml:338(entry) toolset_guide.xml:489(entry) toolset_guide=
.xml:563(entry) =

+#. Tag: entry
+#: toolset_guide.xml:338 toolset_guide.xml:472 toolset_guide.xml:533
+#, no-c-format
 msgid "read database properties from a file"
 msgstr ""
 =

-#: toolset_guide.xml:341(literal) =

+#. Tag: literal
+#: toolset_guide.xml:341
+#, no-c-format
 msgid "--format"
 msgstr ""
 =

-#: toolset_guide.xml:342(entry) =

+#. Tag: entry
+#: toolset_guide.xml:342
+#, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr ""
 =

-#: toolset_guide.xml:345(literal) =

+#. Tag: literal
+#: toolset_guide.xml:345
+#, no-c-format
 msgid "--delimiter=3D;"
 msgstr ""
 =

-#: toolset_guide.xml:346(entry) =

+#. Tag: entry
+#: toolset_guide.xml:346
+#, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr ""
 =

-#: toolset_guide.xml:352(para) =

+#. Tag: para
+#: toolset_guide.xml:352
+#, no-c-format
 msgid "You may even embed <literal>SchemaExport</literal> in your applicat=
ion:"
 msgstr ""
 =

-#: toolset_guide.xml:362(title) =

+#. Tag: programlisting
+#: toolset_guide.xml:356
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D ....;\n"
+      "new SchemaExport(cfg).create(false, true);]]>"
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:361
+#, no-c-format
 msgid "Properties"
 msgstr ""
 =

-#: toolset_guide.xml:364(para) =

+#. Tag: para
+#: toolset_guide.xml:363
+#, no-c-format
 msgid "Database properties may be specified"
 msgstr ""
 =

-#: toolset_guide.xml:370(para) =

+#. Tag: para
+#: toolset_guide.xml:369
+#, no-c-format
 msgid "as system properties with <literal>-D</literal><emphasis>&lt;proper=
ty&gt;</emphasis>"
 msgstr ""
 =

-#: toolset_guide.xml:373(para) =

+#. Tag: para
+#: toolset_guide.xml:372
+#, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr ""
 =

-#: toolset_guide.xml:376(para) =

+#. Tag: para
+#: toolset_guide.xml:375
+#, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
 =

-#: toolset_guide.xml:380(para) =

+#. Tag: para
+#: toolset_guide.xml:379
+#, no-c-format
 msgid "The needed properties are:"
 msgstr ""
 =

-#: toolset_guide.xml:385(title) =

+#. Tag: title
+#: toolset_guide.xml:384
+#, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr ""
 =

-#: toolset_guide.xml:391(entry) =

+#. Tag: entry
+#: toolset_guide.xml:390
+#, no-c-format
 msgid "Property Name"
 msgstr ""
 =

-#: toolset_guide.xml:397(literal) =

+#. Tag: literal
+#: toolset_guide.xml:396
+#, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr ""
 =

-#: toolset_guide.xml:398(entry) =

+#. Tag: entry
+#: toolset_guide.xml:397
+#, no-c-format
 msgid "jdbc driver class"
 msgstr ""
 =

-#: toolset_guide.xml:401(literal) =

+#. Tag: literal
+#: toolset_guide.xml:400
+#, no-c-format
 msgid "hibernate.connection.url"
 msgstr ""
 =

-#: toolset_guide.xml:402(entry) =

+#. Tag: entry
+#: toolset_guide.xml:401
+#, no-c-format
 msgid "jdbc url"
 msgstr ""
 =

-#: toolset_guide.xml:405(literal) =

+#. Tag: literal
+#: toolset_guide.xml:404
+#, no-c-format
 msgid "hibernate.connection.username"
 msgstr ""
 =

-#: toolset_guide.xml:406(entry) =

+#. Tag: entry
+#: toolset_guide.xml:405
+#, no-c-format
 msgid "database user"
 msgstr ""
 =

-#: toolset_guide.xml:409(literal) =

+#. Tag: literal
+#: toolset_guide.xml:408
+#, no-c-format
 msgid "hibernate.connection.password"
 msgstr ""
 =

-#: toolset_guide.xml:410(entry) =

+#. Tag: entry
+#: toolset_guide.xml:409
+#, no-c-format
 msgid "user password"
 msgstr ""
 =

-#: toolset_guide.xml:413(literal) =

+#. Tag: literal
+#: toolset_guide.xml:412
+#, no-c-format
 msgid "hibernate.dialect"
 msgstr ""
 =

-#: toolset_guide.xml:414(entry) =

+#. Tag: entry
+#: toolset_guide.xml:413
+#, no-c-format
 msgid "dialect"
 msgstr ""
 =

-#: toolset_guide.xml:423(title) =

+#. Tag: title
+#: toolset_guide.xml:422
+#, no-c-format
 msgid "Using Ant"
 msgstr ""
 =

-#: toolset_guide.xml:425(para) =

+#. Tag: para
+#: toolset_guide.xml:424
+#, no-c-format
 msgid "You can call <literal>SchemaExport</literal> from your Ant build sc=
ript:"
 msgstr ""
 =

-#: toolset_guide.xml:450(title) =

+#. Tag: programlisting
+#: toolset_guide.xml:428
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"schemaexport\">\n"
+      "    <taskdef name=3D\"schemaexport\"\n"
+      "        classname=3D\"org.hibernate.tool.hbm2ddl.SchemaExportTask\"=
\n"
+      "        classpathref=3D\"class.path\"/>\n"
+      "    \n"
+      "    <schemaexport\n"
+      "        properties=3D\"hibernate.properties\"\n"
+      "        quiet=3D\"no\"\n"
+      "        text=3D\"no\"\n"
+      "        drop=3D\"no\"\n"
+      "        delimiter=3D\";\"\n"
+      "        output=3D\"schema-export.sql\">\n"
+      "        <fileset dir=3D\"src\">\n"
+      "            <include name=3D\"**/*.hbm.xml\"/>\n"
+      "        </fileset>\n"
+      "    </schemaexport>\n"
+      "</target>]]>"
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:433
+#, no-c-format
 msgid "Incremental schema updates"
 msgstr ""
 =

-#: toolset_guide.xml:452(para) =

+#. Tag: para
+#: toolset_guide.xml:435
+#, no-c-format
 msgid "The <literal>SchemaUpdate</literal> tool will update an existing sc=
hema with \"incremental\" changes. Note that <literal>SchemaUpdate</literal=
> depends heavily upon the JDBC metadata API, so it will not work with all =
JDBC drivers."
 msgstr ""
 =

-#: toolset_guide.xml:460(literal) =

-msgid "org.hibernate.tool.hbm2ddl.SchemaUpdate"
+#. Tag: para
+#: toolset_guide.xml:441
+#, no-c-format
+msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasi=
s> <literal>org.hibernate.tool.hbm2ddl.SchemaUpdate</literal> <emphasis>opt=
ions mapping_files</emphasis>"
 msgstr ""
 =

-#: toolset_guide.xml:464(title) =

+#. Tag: title
+#: toolset_guide.xml:447
+#, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr ""
 =

-#: toolset_guide.xml:481(entry) =

+#. Tag: entry
+#: toolset_guide.xml:464
+#, no-c-format
 msgid "don't export the script to the database"
 msgstr ""
 =

-#: toolset_guide.xml:493(literal) toolset_guide.xml:567(literal) =

-msgid ".cfg.xml"
+#. Tag: entry
+#: toolset_guide.xml:476 toolset_guide.xml:537
+#, no-c-format
+msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
 =

-#: toolset_guide.xml:493(entry) toolset_guide.xml:567(entry) =

-msgid "specify a <placeholder-1/> file"
+#. Tag: para
+#: toolset_guide.xml:482
+#, no-c-format
+msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 =

-#: toolset_guide.xml:499(para) =

-msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
+#. Tag: programlisting
+#: toolset_guide.xml:486
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D ....;\n"
+      "new SchemaUpdate(cfg).execute(false);]]>"
 msgstr ""
 =

-#: toolset_guide.xml:509(title) =

+#. Tag: title
+#: toolset_guide.xml:491
+#, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr ""
 =

-#: toolset_guide.xml:511(para) =

+#. Tag: para
+#: toolset_guide.xml:493
+#, no-c-format
 msgid "You can call <literal>SchemaUpdate</literal> from the Ant script:"
 msgstr ""
 =

-#: toolset_guide.xml:532(title) =

+#. Tag: programlisting
+#: toolset_guide.xml:497
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"schemaupdate\">\n"
+      "    <taskdef name=3D\"schemaupdate\"\n"
+      "        classname=3D\"org.hibernate.tool.hbm2ddl.SchemaUpdateTask\"=
\n"
+      "        classpathref=3D\"class.path\"/>\n"
+      "    \n"
+      "    <schemaupdate\n"
+      "        properties=3D\"hibernate.properties\"\n"
+      "        quiet=3D\"no\">\n"
+      "        <fileset dir=3D\"src\">\n"
+      "            <include name=3D\"**/*.hbm.xml\"/>\n"
+      "        </fileset>\n"
+      "    </schemaupdate>\n"
+      "</target>]]>"
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:502
+#, no-c-format
 msgid "Schema validation"
 msgstr ""
 =

-#: toolset_guide.xml:534(para) =

+#. Tag: para
+#: toolset_guide.xml:504
+#, no-c-format
 msgid "The <literal>SchemaValidator</literal> tool will validate that the =
existing database schema \"matches\" your mapping documents. Note that <lit=
eral>SchemaValidator</literal> depends heavily upon the JDBC metadata API, =
so it will not work with all JDBC drivers. This tool is extremely useful fo=
r testing."
 msgstr ""
 =

-#: toolset_guide.xml:542(literal) =

-msgid "org.hibernate.tool.hbm2ddl.SchemaValidator"
+#. Tag: para
+#: toolset_guide.xml:510
+#, no-c-format
+msgid "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasi=
s> <literal>org.hibernate.tool.hbm2ddl.SchemaValidator</literal> <emphasis>=
options mapping_files</emphasis>"
 msgstr ""
 =

-#: toolset_guide.xml:546(title) =

+#. Tag: title
+#: toolset_guide.xml:516
+#, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr ""
 =

-#: toolset_guide.xml:573(para) =

+#. Tag: para
+#: toolset_guide.xml:543
+#, no-c-format
 msgid "You may embed <literal>SchemaValidator</literal> in your applicatio=
n:"
 msgstr ""
 =

-#: toolset_guide.xml:583(title) =

+#. Tag: programlisting
+#: toolset_guide.xml:547
+#, no-c-format
+msgid ""
+      "<![CDATA[Configuration cfg =3D ....;\n"
+      "new SchemaValidator(cfg).validate();]]>"
+msgstr ""
+
+#. Tag: title
+#: toolset_guide.xml:552
+#, no-c-format
 msgid "Using Ant for schema validation"
 msgstr ""
 =

-#: toolset_guide.xml:585(para) =

+#. Tag: para
+#: toolset_guide.xml:554
+#, no-c-format
 msgid "You can call <literal>SchemaValidator</literal> from the Ant script=
:"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: toolset_guide.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: toolset_guide.xml:558
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"schemavalidate\">\n"
+      "    <taskdef name=3D\"schemavalidator\"\n"
+      "        classname=3D\"org.hibernate.tool.hbm2ddl.SchemaValidatorTas=
k\"\n"
+      "        classpathref=3D\"class.path\"/>\n"
+      "    \n"
+      "    <schemavalidator\n"
+      "        properties=3D\"hibernate.properties\">\n"
+      "        <fileset dir=3D\"src\">\n"
+      "            <include name=3D\"**/*.hbm.xml\"/>\n"
+      "        </fileset>\n"
+      "    </schemavalidator>\n"
+      "</target>]]>"
 msgstr ""
 =


Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/tran=
sactions.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/transactio=
ns.pot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/transactio=
ns.pot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,524 +1,949 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:35-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: transactions.xml:5(title) =

+#. Tag: title
+#: transactions.xml:29
+#, no-c-format
 msgid "Transactions And Concurrency"
 msgstr ""
 =

-#: transactions.xml:7(para) =

+#. Tag: para
+#: transactions.xml:31
+#, no-c-format
 msgid "The most important point about Hibernate and concurrency control is=
 that it is very easy to understand. Hibernate directly uses JDBC connectio=
ns and JTA resources without adding any additional locking behavior. We hig=
hly recommend you spend some time with the JDBC, ANSI, and transaction isol=
ation specification of your database management system."
 msgstr ""
 =

-#: transactions.xml:14(para) =

+#. Tag: para
+#: transactions.xml:38
+#, no-c-format
 msgid "Hibernate does not lock objects in memory. Your application can exp=
ect the behavior as defined by the isolation level of your database transac=
tions. Note that thanks to the <literal>Session</literal>, which is also a =
transaction-scoped cache, Hibernate provides repeatable reads for lookup by=
 identifier and entity queries (not reporting queries that return scalar va=
lues)."
 msgstr ""
 =

-#: transactions.xml:22(para) =

+#. Tag: para
+#: transactions.xml:46
+#, no-c-format
 msgid "In addition to versioning for automatic optimistic concurrency cont=
rol, Hibernate also offers a (minor) API for pessimistic locking of rows, u=
sing the <literal>SELECT FOR UPDATE</literal> syntax. Optimistic concurrenc=
y control and this API are discussed later in this chapter."
 msgstr ""
 =

-#: transactions.xml:29(para) =

+#. Tag: para
+#: transactions.xml:53
+#, no-c-format
 msgid "We start the discussion of concurrency control in Hibernate with th=
e granularity of <literal>Configuration</literal>, <literal>SessionFactory<=
/literal>, and <literal>Session</literal>, as well as database transactions=
 and long conversations."
 msgstr ""
 =

-#: transactions.xml:36(title) =

+#. Tag: title
+#: transactions.xml:60
+#, no-c-format
 msgid "Session and transaction scopes"
 msgstr ""
 =

-#: transactions.xml:38(para) =

+#. Tag: para
+#: transactions.xml:62
+#, no-c-format
 msgid "A <literal>SessionFactory</literal> is an expensive-to-create, thre=
adsafe object intended to be shared by all application threads. It is creat=
ed once, usually on application startup, from a <literal>Configuration</lit=
eral> instance."
 msgstr ""
 =

-#: transactions.xml:44(para) =

+#. Tag: para
+#: transactions.xml:68
+#, no-c-format
 msgid "A <literal>Session</literal> is an inexpensive, non-threadsafe obje=
ct that should be used once, for a single request, a conversation, single u=
nit of work, and then discarded. A <literal>Session</literal> will not obta=
in a JDBC <literal>Connection</literal> (or a <literal>Datasource</literal>=
) unless it is needed, hence consume no resources until used."
 msgstr ""
 =

-#: transactions.xml:52(para) =

+#. Tag: para
+#: transactions.xml:76
+#, no-c-format
 msgid "To complete this picture you also have to think about database tran=
sactions. A database transaction has to be as short as possible, to reduce =
lock contention in the database. Long database transactions will prevent yo=
ur application from scaling to highly concurrent load. Hence, it is almost =
never good design to hold a database transaction open during user think tim=
e, until the unit of work is complete."
 msgstr ""
 =

-#: transactions.xml:61(para) =

+#. Tag: para
+#: transactions.xml:85
+#, no-c-format
 msgid "What is the scope of a unit of work? Can a single Hibernate <litera=
l>Session</literal> span several database transactions or is this a one-to-=
one relationship of scopes? When should you open and close a <literal>Sessi=
on</literal> and how do you demarcate the database transaction boundaries?"
 msgstr ""
 =

-#: transactions.xml:69(title) =

+#. Tag: title
+#: transactions.xml:93
+#, no-c-format
 msgid "Unit of work"
 msgstr ""
 =

-#: transactions.xml:71(para) =

+#. Tag: para
+#: transactions.xml:95
+#, no-c-format
 msgid "First, don't use the <emphasis>session-per-operation</emphasis> ant=
ipattern, that is, don't open and close a <literal>Session</literal> for ev=
ery simple database call in a single thread! Of course, the same is true fo=
r database transactions. Database calls in an application are made using a =
planned sequence, they are grouped into atomic units of work. (Note that th=
is also means that auto-commit after every single SQL statement is useless =
in an application, this mode is intended for ad-hoc SQL console work. Hiber=
nate disables, or expects the application server to do so, auto-commit mode=
 immediately.) Database transactions are never optional, all communication =
with a database has to occur inside a transaction, no matter if you read or=
 write data. As explained, auto-commit behavior for reading data should be =
avoided, as many small transactions are unlikely to perform better than one=
 clearly defined unit of work. The latter is also much more maintainable an=
d extensible."
 msgstr ""
 =

-#: transactions.xml:87(para) =

-msgid "The most common pattern in a multi-user client/server application i=
s <emphasis>session-per-request</emphasis>. In this model, a request from t=
he client is send to the server (where the Hibernate persistence layer runs=
), a new Hibernate <literal>Session</literal> is opened, and all database o=
perations are executed in this unit of work. Once the work has been complet=
ed (and the response for the client has been prepared), the session is flus=
hed and closed. You would also use a single database transaction to serve t=
he clients request, starting and committing it when you open and close the =
<literal>Session</literal>. The relationship between the two is one-to-one =
and this model is a perfect fit for many applications."
+#. Tag: para
+#: transactions.xml:111
+#, no-c-format
+msgid "The most common pattern in a multi-user client/server application i=
s <emphasis>session-per-request</emphasis>. In this model, a request from t=
he client is sent to the server (where the Hibernate persistence layer runs=
), a new Hibernate <literal>Session</literal> is opened, and all database o=
perations are executed in this unit of work. Once the work has been complet=
ed (and the response for the client has been prepared), the session is flus=
hed and closed. You would also use a single database transaction to serve t=
he clients request, starting and committing it when you open and close the =
<literal>Session</literal>. The relationship between the two is one-to-one =
and this model is a perfect fit for many applications."
 msgstr ""
 =

-#: transactions.xml:99(para) =

-msgid "The challenge lies in the implementation. Hibernate provides built-=
in management of the \"current session\" to simplify this pattern. All you =
have to do is start a transaction when a server request has to be processed=
, and end the transaction before the response is send to the client. You ca=
n do this in any way you like, common solutions are <literal>ServletFilter<=
/literal>, AOP interceptor with a pointcut on the service methods, or a pro=
xy/interception container. An EJB container is a standardized way to implem=
ent cross-cutting aspects such as transaction demarcation on EJB session be=
ans, declaratively with CMT. If you decide to use programmatic transaction =
demarcation, prefer the Hibernate <literal>Transaction</literal> API shown =
later in this chapter, for ease of use and code portability."
+#. Tag: para
+#: transactions.xml:123
+#, no-c-format
+msgid "The challenge lies in the implementation. Hibernate provides built-=
in management of the \"current session\" to simplify this pattern. All you =
have to do is start a transaction when a server request has to be processed=
, and end the transaction before the response is sent to the client. You ca=
n do this in any way you like, common solutions are <literal>ServletFilter<=
/literal>, AOP interceptor with a pointcut on the service methods, or a pro=
xy/interception container. An EJB container is a standardized way to implem=
ent cross-cutting aspects such as transaction demarcation on EJB session be=
ans, declaratively with CMT. If you decide to use programmatic transaction =
demarcation, prefer the Hibernate <literal>Transaction</literal> API shown =
later in this chapter, for ease of use and code portability."
 msgstr ""
 =

-#: transactions.xml:112(para) =

+#. Tag: para
+#: transactions.xml:136
+#, no-c-format
 msgid "Your application code can access a \"current session\" to process t=
he request by simply calling <literal>sessionFactory.getCurrentSession()</l=
iteral> anywhere and as often as needed. You will always get a <literal>Ses=
sion</literal> scoped to the current database transaction. This has to be c=
onfigured for either resource-local or JTA environments, see <xref linkend=
=3D\"architecture-current-session\"/>."
 msgstr ""
 =

-#: transactions.xml:120(para) =

+#. Tag: para
+#: transactions.xml:144
+#, no-c-format
 msgid "Sometimes it is convenient to extend the scope of a <literal>Sessio=
n</literal> and database transaction until the \"view has been rendered\". =
This is especially useful in servlet applications that utilize a separate r=
endering phase after the request has been processed. Extending the database=
 transaction until view rendering is complete is easy to do if you implemen=
t your own interceptor. However, it is not easily doable if you rely on EJB=
s with container-managed transactions, as a transaction will be completed w=
hen an EJB method returns, before rendering of any view can start. See the =
Hibernate website and forum for tips and examples around this <emphasis>Ope=
n Session in View</emphasis> pattern."
 msgstr ""
 =

-#: transactions.xml:135(title) =

+#. Tag: title
+#: transactions.xml:159
+#, no-c-format
 msgid "Long conversations"
 msgstr ""
 =

-#: transactions.xml:137(para) =

+#. Tag: para
+#: transactions.xml:161
+#, no-c-format
 msgid "The session-per-request pattern is not the only useful concept you =
can use to design units of work. Many business processes require a whole se=
ries of interactions with the user interleaved with database accesses. In w=
eb and enterprise applications it is not acceptable for a database transact=
ion to span a user interaction. Consider the following example:"
 msgstr ""
 =

-#: transactions.xml:147(para) =

+#. Tag: para
+#: transactions.xml:171
+#, no-c-format
 msgid "The first screen of a dialog opens, the data seen by the user has b=
een loaded in a particular <literal>Session</literal> and database transact=
ion. The user is free to modify the objects."
 msgstr ""
 =

-#: transactions.xml:154(para) =

+#. Tag: para
+#: transactions.xml:178
+#, no-c-format
 msgid "The user clicks \"Save\" after 5 minutes and expects his modificati=
ons to be made persistent; he also expects that he was the only person edit=
ing this information and that no conflicting modification can occur."
 msgstr ""
 =

-#: transactions.xml:162(para) =

+#. Tag: para
+#: transactions.xml:186
+#, no-c-format
 msgid "We call this unit of work, from the point of view of the user, a lo=
ng running <emphasis>conversation</emphasis> (or <emphasis>application tran=
saction</emphasis>). There are many ways how you can implement this in your=
 application."
 msgstr ""
 =

-#: transactions.xml:168(para) =

+#. Tag: para
+#: transactions.xml:192
+#, no-c-format
 msgid "A first naive implementation might keep the <literal>Session</liter=
al> and database transaction open during user think time, with locks held i=
n the database to prevent concurrent modification, and to guarantee isolati=
on and atomicity. This is of course an anti-pattern, since lock contention =
would not allow the application to scale with the number of concurrent user=
s."
 msgstr ""
 =

-#: transactions.xml:176(para) =

-msgid "Clearly, we have to use several database transactions to implement =
the converastion. In this case, maintaining isolation of business processes=
 becomes the partial responsibility of the application tier. A single conve=
rsation usually spans several database transactions. It will be atomic if o=
nly one of these database transactions (the last one) stores the updated da=
ta, all others simply read data (e.g. in a wizard-style dialog spanning sev=
eral request/response cycles). This is easier to implement than it might so=
und, especially if you use Hibernate's features:"
+#. Tag: para
+#: transactions.xml:200
+#, no-c-format
+msgid "Clearly, we have to use several database transactions to implement =
the conversation. In this case, maintaining isolation of business processes=
 becomes the partial responsibility of the application tier. A single conve=
rsation usually spans several database transactions. It will be atomic if o=
nly one of these database transactions (the last one) stores the updated da=
ta, all others simply read data (e.g. in a wizard-style dialog spanning sev=
eral request/response cycles). This is easier to implement than it might so=
und, especially if you use Hibernate's features:"
 msgstr ""
 =

-#: transactions.xml:189(para) =

-msgid "<emphasis>Automatic Versioning</emphasis> - Hibernate can do automa=
tic optimistic concurrency control for you, it can automatically detect if =
a concurrent modification occured during user think time. Usually we only c=
heck at the end of the conversation."
+#. Tag: para
+#: transactions.xml:213
+#, no-c-format
+msgid "<emphasis>Automatic Versioning</emphasis> - Hibernate can do automa=
tic optimistic concurrency control for you, it can automatically detect if =
a concurrent modification occurred during user think time. Usually we only =
check at the end of the conversation."
 msgstr ""
 =

-#: transactions.xml:197(para) =

+#. Tag: para
+#: transactions.xml:221
+#, no-c-format
 msgid "<emphasis>Detached Objects</emphasis> - If you decide to use the al=
ready discussed <emphasis>session-per-request</emphasis> pattern, all loade=
d instances will be in detached state during user think time. Hibernate all=
ows you to reattach the objects and persist the modifications, the pattern =
is called <emphasis>session-per-request-with-detached-objects</emphasis>. A=
utomatic versioning is used to isolate concurrent modifications."
 msgstr ""
 =

-#: transactions.xml:207(para) =

-msgid "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate <li=
teral>Session</literal> may be disconnected from the underlying JDBC connec=
tion after the database transaction has been committed, and reconnected whe=
n a new client request occurs. This pattern is known as <emphasis>session-p=
er-conversation</emphasis> and makes even reattachment unnecessary. Automat=
ic versioning is used to isolate concurrent modifications and the <literal>=
Session</literal> is usually not allowed to be flushed automatically, but e=
xplicitely."
+#. Tag: para
+#: transactions.xml:231
+#, no-c-format
+msgid "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate <li=
teral>Session</literal> may be disconnected from the underlying JDBC connec=
tion after the database transaction has been committed, and reconnected whe=
n a new client request occurs. This pattern is known as <emphasis>session-p=
er-conversation</emphasis> and makes even reattachment unnecessary. Automat=
ic versioning is used to isolate concurrent modifications and the <literal>=
Session</literal> is usually not allowed to be flushed automatically, but e=
xplicitly."
 msgstr ""
 =

-#: transactions.xml:220(para) =

+#. Tag: para
+#: transactions.xml:244
+#, no-c-format
 msgid "Both <emphasis>session-per-request-with-detached-objects</emphasis>=
 and <emphasis>session-per-conversation</emphasis> have advantages and disa=
dvantages, we discuss them later in this chapter in the context of optimist=
ic concurrency control."
 msgstr ""
 =

-#: transactions.xml:229(title) =

+#. Tag: title
+#: transactions.xml:253
+#, no-c-format
 msgid "Considering object identity"
 msgstr ""
 =

-#: transactions.xml:231(para) =

+#. Tag: para
+#: transactions.xml:255
+#, no-c-format
 msgid "An application may concurrently access the same persistent state in=
 two different <literal>Session</literal>s. However, an instance of a persi=
stent class is never shared between two <literal>Session</literal> instance=
s. Hence there are two different notions of identity:"
 msgstr ""
 =

-#: transactions.xml:240(term) =

+#. Tag: term
+#: transactions.xml:264
+#, no-c-format
 msgid "Database Identity"
 msgstr ""
 =

-#: transactions.xml:243(literal) =

+#. Tag: literal
+#: transactions.xml:267
+#, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr ""
 =

-#: transactions.xml:248(term) =

+#. Tag: term
+#: transactions.xml:272
+#, no-c-format
 msgid "JVM Identity"
 msgstr ""
 =

-#: transactions.xml:251(literal) =

+#. Tag: literal
+#: transactions.xml:275
+#, no-c-format
 msgid "foo=3D=3Dbar"
 msgstr ""
 =

-#: transactions.xml:257(para) =

-msgid "Then for objects attached to a <emphasis>particular</emphasis><lite=
ral>Session</literal> (i.e. in the scope of a <literal>Session</literal>) t=
he two notions are equivalent, and JVM identity for database identity is gu=
aranteed by Hibernate. However, while the application might concurrently ac=
cess the \"same\" (persistent identity) business object in two different se=
ssions, the two instances will actually be \"different\" (JVM identity). Co=
nflicts are resolved using (automatic versioning) at flush/commit time, usi=
ng an optimistic approach."
+#. Tag: para
+#: transactions.xml:281
+#, no-c-format
+msgid "Then for objects attached to a <emphasis>particular</emphasis> <lit=
eral>Session</literal> (i.e. in the scope of a <literal>Session</literal>) =
the two notions are equivalent, and JVM identity for database identity is g=
uaranteed by Hibernate. However, while the application might concurrently a=
ccess the \"same\" (persistent identity) business object in two different s=
essions, the two instances will actually be \"different\" (JVM identity). C=
onflicts are resolved using (automatic versioning) at flush/commit time, us=
ing an optimistic approach."
 msgstr ""
 =

-#: transactions.xml:266(para) =

+#. Tag: para
+#: transactions.xml:290
+#, no-c-format
 msgid "This approach leaves Hibernate and the database to worry about conc=
urrency; it also provides the best scalability, since guaranteeing identity=
 in single-threaded units of work only doesn't need expensive locking or ot=
her means of synchronization. The application never needs to synchronize on=
 any business object, as long as it sticks to a single thread per <literal>=
Session</literal>. Within a <literal>Session</literal> the application may =
safely use <literal>=3D=3D</literal> to compare objects."
 msgstr ""
 =

-#: transactions.xml:275(para) =

+#. Tag: para
+#: transactions.xml:299
+#, no-c-format
 msgid "However, an application that uses <literal>=3D=3D</literal> outside=
 of a <literal>Session</literal>, might see unexpected results. This might =
occur even in some unexpected places, for example, if you put two detached =
instances into the same <literal>Set</literal>. Both might have the same da=
tabase identity (i.e. they represent the same row), but JVM identity is by =
definition not guaranteed for instances in detached state. The developer ha=
s to override the <literal>equals()</literal> and <literal>hashCode()</lite=
ral> methods in persistent classes and implement his own notion of object e=
quality. There is one caveat: Never use the database identifier to implemen=
t equality, use a business key, a combination of unique, usually immutable,=
 attributes. The database identifier will change if a transient object is m=
ade persistent. If the transient instance (usually together with detached i=
nstances) is held in a <literal>Set</literal>, changing the hashcode breaks=
 the contract of t!
 he <literal>Set</literal>. Attributes for business keys don't have to be a=
s stable as database primary keys, you only have to guarantee stability as =
long as the objects are in the same <literal>Set</literal>. See the Hiberna=
te website for a more thorough discussion of this issue. Also note that thi=
s is not a Hibernate issue, but simply how Java object identity and equalit=
y has to be implemented."
 msgstr ""
 =

-#: transactions.xml:296(title) =

+#. Tag: title
+#: transactions.xml:320
+#, no-c-format
 msgid "Common issues"
 msgstr ""
 =

-#: transactions.xml:298(para) =

+#. Tag: para
+#: transactions.xml:322
+#, no-c-format
 msgid "Never use the anti-patterns <emphasis>session-per-user-session</emp=
hasis> or <emphasis>session-per-application</emphasis> (of course, there ar=
e rare exceptions to this rule). Note that some of the following issues mig=
ht also appear with the recommended patterns, make sure you understand the =
implications before making a design decision:"
 msgstr ""
 =

-#: transactions.xml:307(para) =

+#. Tag: para
+#: transactions.xml:331
+#, no-c-format
 msgid "A <literal>Session</literal> is not thread-safe. Things which are s=
upposed to work concurrently, like HTTP requests, session beans, or Swing w=
orkers, will cause race conditions if a <literal>Session</literal> instance=
 would be shared. If you keep your Hibernate <literal>Session</literal> in =
your <literal>HttpSession</literal> (discussed later), you should consider =
synchronizing access to your Http session. Otherwise, a user that clicks re=
load fast enough may use the same <literal>Session</literal> in two concurr=
ently running threads."
 msgstr ""
 =

-#: transactions.xml:318(para) =

+#. Tag: para
+#: transactions.xml:342
+#, no-c-format
 msgid "An exception thrown by Hibernate means you have to rollback your da=
tabase transaction and close the <literal>Session</literal> immediately (di=
scussed later in more detail). If your <literal>Session</literal> is bound =
to the application, you have to stop the application. Rolling back the data=
base transaction doesn't put your business objects back into the state they=
 were at the start of the transaction. This means the database state and th=
e business objects do get out of sync. Usually this is not a problem, becau=
se exceptions are not recoverable and you have to start over after rollback=
 anyway."
 msgstr ""
 =

-#: transactions.xml:330(para) =

+#. Tag: para
+#: transactions.xml:354
+#, no-c-format
 msgid "The <literal>Session</literal> caches every object that is in persi=
stent state (watched and checked for dirty state by Hibernate). This means =
it grows endlessly until you get an OutOfMemoryException, if you keep it op=
en for a long time or simply load too much data. One solution for this is t=
o call <literal>clear()</literal> and <literal>evict()</literal> to manage =
the <literal>Session</literal> cache, but you most likely should consider a=
 Stored Procedure if you need mass data operations. Some solutions are show=
n in <xref linkend=3D\"batch\"/>. Keeping a <literal>Session</literal> open=
 for the duration of a user session also means a high probability of stale =
data."
 msgstr ""
 =

-#: transactions.xml:348(title) =

+#. Tag: title
+#: transactions.xml:372
+#, no-c-format
 msgid "Database transaction demarcation"
 msgstr ""
 =

-#: transactions.xml:350(para) =

-msgid "Datatabase (or system) transaction boundaries are always necessary.=
 No communication with the database can occur outside of a database transac=
tion (this seems to confuse many developers who are used to the auto-commit=
 mode). Always use clear transaction boundaries, even for read-only operati=
ons. Depending on your isolation level and database capabilities this might=
 not be required but there is no downside if you always demarcate transacti=
ons explicitly. Certainly, a single database transaction is going to perfor=
m better than many small transactions, even for reading data."
+#. Tag: para
+#: transactions.xml:374
+#, no-c-format
+msgid "Database (or system) transaction boundaries are always necessary. N=
o communication with the database can occur outside of a database transacti=
on (this seems to confuse many developers who are used to the auto-commit m=
ode). Always use clear transaction boundaries, even for read-only operation=
s. Depending on your isolation level and database capabilities this might n=
ot be required but there is no downside if you always demarcate transaction=
s explicitly. Certainly, a single database transaction is going to perform =
better than many small transactions, even for reading data."
 msgstr ""
 =

-#: transactions.xml:360(para) =

+#. Tag: para
+#: transactions.xml:384
+#, no-c-format
 msgid "A Hibernate application can run in non-managed (i.e. standalone, si=
mple Web- or Swing applications) and managed J2EE environments. In a non-ma=
naged environment, Hibernate is usually responsible for its own database co=
nnection pool. The application developer has to manually set transaction bo=
undaries, in other words, begin, commit, or rollback database transactions =
himself. A managed environment usually provides container-managed transacti=
ons (CMT), with the transaction assembly defined declaratively in deploymen=
t descriptors of EJB session beans, for example. Programmatic transaction d=
emarcation is then no longer necessary."
 msgstr ""
 =

-#: transactions.xml:370(para) =

-msgid "However, it is often desirable to keep your persistence layer porta=
ble between non-managed resource-local environments, and systems that can r=
ely on JTA but use BMT instead of CMT. In both cases you'd use programmatic=
 transaction demaracation. Hibernate offers a wrapper API called <literal>T=
ransaction</literal> that translates into the native transaction system of =
your deployment environment. This API is actually optional, but we strongly=
 encourage its use unless you are in a CMT session bean."
+#. Tag: para
+#: transactions.xml:394
+#, no-c-format
+msgid "However, it is often desirable to keep your persistence layer porta=
ble between non-managed resource-local environments, and systems that can r=
ely on JTA but use BMT instead of CMT. In both cases you'd use programmatic=
 transaction demarcation. Hibernate offers a wrapper API called <literal>Tr=
ansaction</literal> that translates into the native transaction system of y=
our deployment environment. This API is actually optional, but we strongly =
encourage its use unless you are in a CMT session bean."
 msgstr ""
 =

-#: transactions.xml:379(para) =

+#. Tag: para
+#: transactions.xml:403
+#, no-c-format
 msgid "Usually, ending a <literal>Session</literal> involves four distinct=
 phases:"
 msgstr ""
 =

-#: transactions.xml:385(para) =

+#. Tag: para
+#: transactions.xml:409
+#, no-c-format
 msgid "flush the session"
 msgstr ""
 =

-#: transactions.xml:390(para) =

+#. Tag: para
+#: transactions.xml:414
+#, no-c-format
 msgid "commit the transaction"
 msgstr ""
 =

-#: transactions.xml:395(para) =

+#. Tag: para
+#: transactions.xml:419
+#, no-c-format
 msgid "close the session"
 msgstr ""
 =

-#: transactions.xml:400(para) =

+#. Tag: para
+#: transactions.xml:424
+#, no-c-format
 msgid "handle exceptions"
 msgstr ""
 =

-#: transactions.xml:406(para) =

+#. Tag: para
+#: transactions.xml:430
+#, no-c-format
 msgid "Flushing the session has been discussed earlier, we'll now have a c=
loser look at transaction demarcation and exception handling in both manage=
d- and non-managed environments."
 msgstr ""
 =

-#: transactions.xml:413(title) =

+#. Tag: title
+#: transactions.xml:437
+#, no-c-format
 msgid "Non-managed environment"
 msgstr ""
 =

-#: transactions.xml:415(para) =

+#. Tag: para
+#: transactions.xml:439
+#, no-c-format
 msgid "If a Hibernate persistence layer runs in a non-managed environment,=
 database connections are usually handled by simple (i.e. non-DataSource) c=
onnection pools from which Hibernate obtains connections as needed. The ses=
sion/transaction handling idiom looks like this:"
 msgstr ""
 =

-#: transactions.xml:441(para) =

-msgid "You don't have to <literal>flush()</literal> the <literal>Session</=
literal> explicitly - the call to <literal>commit()</literal> automatically=
 triggers the synchronization (depending upon the <xref linkend=3D\"objects=
tate-flushing\">FlushMode</xref> for the session. A call to <literal>close(=
)</literal> marks the end of a session. The main implication of <literal>cl=
ose()</literal> is that the JDBC connection will be relinquished by the ses=
sion. This Java code is portable and runs in both non-managed and JTA envir=
onments."
+#. Tag: programlisting
+#: transactions.xml:446
+#, no-c-format
+msgid ""
+      "<![CDATA[// Non-managed environment idiom\n"
+      "Session sess =3D factory.openSession();\n"
+      "Transaction tx =3D null;\n"
+      "try {\n"
+      "    tx =3D sess.beginTransaction();\n"
+      "\n"
+      "    // do some work\n"
+      "    ...\n"
+      "\n"
+      "    tx.commit();\n"
+      "}\n"
+      "catch (RuntimeException e) {\n"
+      "    if (tx !=3D null) tx.rollback();\n"
+      "    throw e; // or display error message\n"
+      "}\n"
+      "finally {\n"
+      "    sess.close();\n"
+      "}]]>"
 msgstr ""
 =

-#: transactions.xml:450(para) =

+#. Tag: para
+#: transactions.xml:448
+#, no-c-format
+msgid "You don't have to <literal>flush()</literal> the <literal>Session</=
literal> explicitly - the call to <literal>commit()</literal> automatically=
 triggers the synchronization (depending upon the <link linkend=3D\"objects=
tate-flushing\">FlushMode</link> for the session. A call to <literal>close(=
)</literal> marks the end of a session. The main implication of <literal>cl=
ose()</literal> is that the JDBC connection will be relinquished by the ses=
sion. This Java code is portable and runs in both non-managed and JTA envir=
onments."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:457
+#, no-c-format
 msgid "A much more flexible solution is Hibernate's built-in \"current ses=
sion\" context management, as described earlier:"
 msgstr ""
 =

-#: transactions.xml:469(para) =

+#. Tag: programlisting
+#: transactions.xml:462
+#, no-c-format
+msgid ""
+      "<![CDATA[// Non-managed environment idiom with getCurrentSession()\=
n"
+      "try {\n"
+      "    factory.getCurrentSession().beginTransaction();\n"
+      "\n"
+      "    // do some work\n"
+      "    ...\n"
+      "\n"
+      "    factory.getCurrentSession().getTransaction().commit();\n"
+      "}\n"
+      "catch (RuntimeException e) {\n"
+      "    factory.getCurrentSession().getTransaction().rollback();\n"
+      "    throw e; // or display error message\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:464
+#, no-c-format
 msgid "You will very likely never see these code snippets in a regular app=
lication; fatal (system) exceptions should always be caught at the \"top\".=
 In other words, the code that executes Hibernate calls (in the persistence=
 layer) and the code that handles <literal>RuntimeException</literal> (and =
usually can only clean up and exit) are in different layers. The current co=
ntext management by Hibernate can significantly simplify this design, as al=
l you need is access to a <literal>SessionFactory</literal>. Exception hand=
ling is discussed later in this chapter."
 msgstr ""
 =

-#: transactions.xml:479(para) =

+#. Tag: para
+#: transactions.xml:474
+#, no-c-format
 msgid "Note that you should select <literal>org.hibernate.transaction.JDBC=
TransactionFactory</literal> (which is the default), and for the second exa=
mple <literal>\"thread\"</literal> as your <literal>hibernate.current_sessi=
on_context_class</literal>."
 msgstr ""
 =

-#: transactions.xml:488(title) =

+#. Tag: title
+#: transactions.xml:483
+#, no-c-format
 msgid "Using JTA"
 msgstr ""
 =

-#: transactions.xml:490(para) =

+#. Tag: para
+#: transactions.xml:485
+#, no-c-format
 msgid "If your persistence layer runs in an application server (e.g. behin=
d EJB session beans), every datasource connection obtained by Hibernate wil=
l automatically be part of the global JTA transaction. You can also install=
 a standalone JTA implementation and use it without EJB. Hibernate offers t=
wo strategies for JTA integration."
 msgstr ""
 =

-#: transactions.xml:497(para) =

+#. Tag: para
+#: transactions.xml:492
+#, no-c-format
 msgid "If you use bean-managed transactions (BMT) Hibernate will tell the =
application server to start and end a BMT transaction if you use the <liter=
al>Transaction</literal> API. So, the transaction management code is identi=
cal to the non-managed environment."
 msgstr ""
 =

-#: transactions.xml:522(para) =

+#. Tag: programlisting
+#: transactions.xml:498
+#, no-c-format
+msgid ""
+      "<![CDATA[// BMT idiom\n"
+      "Session sess =3D factory.openSession();\n"
+      "Transaction tx =3D null;\n"
+      "try {\n"
+      "    tx =3D sess.beginTransaction();\n"
+      "\n"
+      "    // do some work\n"
+      "    ...\n"
+      "\n"
+      "    tx.commit();\n"
+      "}\n"
+      "catch (RuntimeException e) {\n"
+      "    if (tx !=3D null) tx.rollback();\n"
+      "    throw e; // or display error message\n"
+      "}\n"
+      "finally {\n"
+      "    sess.close();\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:500
+#, no-c-format
 msgid "If you want to use a transaction-bound <literal>Session</literal>, =
that is, the <literal>getCurrentSession()</literal> functionality for easy =
context propagation, you will have to use the JTA <literal>UserTransaction<=
/literal> API directly:"
 msgstr ""
 =

-#: transactions.xml:546(para) =

-msgid "With CMT, transaction demarcation is done in session bean deploymen=
t descriptors, not programatically, hence, the code is reduced to:"
+#. Tag: programlisting
+#: transactions.xml:506
+#, no-c-format
+msgid ""
+      "<![CDATA[// BMT idiom with getCurrentSession()\n"
+      "try {\n"
+      "    UserTransaction tx =3D (UserTransaction)new InitialContext()\n"
+      "                            .lookup(\"java:comp/UserTransaction\");=
\n"
+      "\n"
+      "    tx.begin();\n"
+      "\n"
+      "    // Do some work on Session bound to transaction\n"
+      "    factory.getCurrentSession().load(...);\n"
+      "    factory.getCurrentSession().persist(...);\n"
+      "\n"
+      "    tx.commit();\n"
+      "}\n"
+      "catch (RuntimeException e) {\n"
+      "    tx.rollback();\n"
+      "    throw e; // or display error message\n"
+      "}]]>"
 msgstr ""
 =

-#: transactions.xml:558(para) =

+#. Tag: para
+#: transactions.xml:508
+#, no-c-format
+msgid "With CMT, transaction demarcation is done in session bean deploymen=
t descriptors, not programmatically, hence, the code is reduced to:"
+msgstr ""
+
+#. Tag: programlisting
+#: transactions.xml:513
+#, no-c-format
+msgid ""
+      "<![CDATA[// CMT idiom\n"
+      " Session sess =3D factory.getCurrentSession();\n"
+      "\n"
+      " // do some work\n"
+      " ...\n"
+      "]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:515
+#, no-c-format
 msgid "In a CMT/EJB even rollback happens automatically, since an unhandle=
d <literal>RuntimeException</literal> thrown by a session bean method tells=
 the container to set the global transaction to rollback. <emphasis>This me=
ans you do not need to use the Hibernate <literal>Transaction</literal> API=
 at all with BMT or CMT, and you get automatic propagation of the \"current=
\" Session bound to the transaction.</emphasis>"
 msgstr ""
 =

-#: transactions.xml:566(para) =

-msgid "Note that you should choose <literal>org.hibernate.transaction.JTAT=
ransactionFactory</literal> if you use JTA directly (BMT), and <literal>org=
.hibernate.transaction.CMTTransactionFactory</literal> in a CMT session bea=
n, when you configure Hibernate's transaction factory. Remember to also set=
 <literal>hibernate.transaction.manager_lookup_class</literal>. Furthermore=
, make sure that your <literal>hibernate.current_session_context_class</lit=
eral> is either unset (backwards compatiblity), or set to <literal>\"jta\"<=
/literal>."
+#. Tag: para
+#: transactions.xml:523
+#, no-c-format
+msgid "Note that you should choose <literal>org.hibernate.transaction.JTAT=
ransactionFactory</literal> if you use JTA directly (BMT), and <literal>org=
.hibernate.transaction.CMTTransactionFactory</literal> in a CMT session bea=
n, when you configure Hibernate's transaction factory. Remember to also set=
 <literal>hibernate.transaction.manager_lookup_class</literal>. Furthermore=
, make sure that your <literal>hibernate.current_session_context_class</lit=
eral> is either unset (backwards compatibility), or set to <literal>\"jta\"=
</literal>."
 msgstr ""
 =

-#: transactions.xml:575(para) =

-msgid "The <literal>getCurrentSession()</literal> operation has one downsi=
de in a JTA environment. There is one caveat to the use of <literal>after_s=
tatement</literal> connection release mode, which is then used by default. =
Due to a silly limitation of the JTA spec, it is not possible for Hibernate=
 to automatically clean up any unclosed <literal>ScrollableResults</literal=
> or <literal>Iterator</literal> instances returned by <literal>scroll()</l=
iteral> or <literal>iterate()</literal>. You <emphasis>must</emphasis> rele=
ase the underlying database cursor by calling <literal>ScrollableResults.cl=
ose()</literal> or <literal>Hibernate.close(Iterator)</literal> explicity f=
rom a <literal>finally</literal> block. (Of course, most applications can e=
asily avoid using <literal>scroll()</literal> or <literal>iterate()</litera=
l> at all from the JTA or CMT code.)"
+#. Tag: para
+#: transactions.xml:532
+#, no-c-format
+msgid "The <literal>getCurrentSession()</literal> operation has one downsi=
de in a JTA environment. There is one caveat to the use of <literal>after_s=
tatement</literal> connection release mode, which is then used by default. =
Due to a silly limitation of the JTA spec, it is not possible for Hibernate=
 to automatically clean up any unclosed <literal>ScrollableResults</literal=
> or <literal>Iterator</literal> instances returned by <literal>scroll()</l=
iteral> or <literal>iterate()</literal>. You <emphasis>must</emphasis> rele=
ase the underlying database cursor by calling <literal>ScrollableResults.cl=
ose()</literal> or <literal>Hibernate.close(Iterator)</literal> explicitly =
from a <literal>finally</literal> block. (Of course, most applications can =
easily avoid using <literal>scroll()</literal> or <literal>iterate()</liter=
al> at all from the JTA or CMT code.)"
 msgstr ""
 =

-#: transactions.xml:591(title) =

+#. Tag: title
+#: transactions.xml:548
+#, no-c-format
 msgid "Exception handling"
 msgstr ""
 =

-#: transactions.xml:593(para) =

+#. Tag: para
+#: transactions.xml:550
+#, no-c-format
 msgid "If the <literal>Session</literal> throws an exception (including an=
y <literal>SQLException</literal>), you should immediately rollback the dat=
abase transaction, call <literal>Session.close()</literal> and discard the =
<literal>Session</literal> instance. Certain methods of <literal>Session</l=
iteral> will <emphasis>not</emphasis> leave the session in a consistent sta=
te. No exception thrown by Hibernate can be treated as recoverable. Ensure =
that the <literal>Session</literal> will be closed by calling <literal>clos=
e()</literal> in a <literal>finally</literal> block."
 msgstr ""
 =

-#: transactions.xml:604(para) =

+#. Tag: para
+#: transactions.xml:561
+#, no-c-format
 msgid "The <literal>HibernateException</literal>, which wraps most of the =
errors that can occur in a Hibernate persistence layer, is an unchecked exc=
eption (it wasn't in older versions of Hibernate). In our opinion, we shoul=
dn't force the application developer to catch an unrecoverable exception at=
 a low layer. In most systems, unchecked and fatal exceptions are handled i=
n one of the first frames of the method call stack (i.e. in higher layers) =
and an error message is presented to the application user (or some other ap=
propriate action is taken). Note that Hibernate might also throw other unch=
ecked exceptions which are not a <literal>HibernateException</literal>. The=
se are, again, not recoverable and appropriate action should be taken."
 msgstr ""
 =

-#: transactions.xml:616(para) =

-msgid "Hibernate wraps <literal>SQLException</literal>s thrown while inter=
acting with the database in a <literal>JDBCException</literal>. In fact, Hi=
bernate will attempt to convert the eexception into a more meningful subcla=
ss of <literal>JDBCException</literal>. The underlying <literal>SQLExceptio=
n</literal> is always available via <literal>JDBCException.getCause()</lite=
ral>. Hibernate converts the <literal>SQLException</literal> into an approp=
riate <literal>JDBCException</literal> subclass using the <literal>SQLExcep=
tionConverter</literal> attached to the <literal>SessionFactory</literal>. =
By default, the <literal>SQLExceptionConverter</literal> is defined by the =
configured dialect; however, it is also possible to plug in a custom implem=
entation (see the javadocs for the <literal>SQLExceptionConverterFactory</l=
iteral> class for details). The standard <literal>JDBCException</literal> s=
ubtypes are:"
+#. Tag: para
+#: transactions.xml:573
+#, no-c-format
+msgid "Hibernate wraps <literal>SQLException</literal>s thrown while inter=
acting with the database in a <literal>JDBCException</literal>. In fact, Hi=
bernate will attempt to convert the exception into a more meaningful subcla=
ss of <literal>JDBCException</literal>. The underlying <literal>SQLExceptio=
n</literal> is always available via <literal>JDBCException.getCause()</lite=
ral>. Hibernate converts the <literal>SQLException</literal> into an approp=
riate <literal>JDBCException</literal> subclass using the <literal>SQLExcep=
tionConverter</literal> attached to the <literal>SessionFactory</literal>. =
By default, the <literal>SQLExceptionConverter</literal> is defined by the =
configured dialect; however, it is also possible to plug in a custom implem=
entation (see the javadocs for the <literal>SQLExceptionConverterFactory</l=
iteral> class for details). The standard <literal>JDBCException</literal> s=
ubtypes are:"
 msgstr ""
 =

-#: transactions.xml:632(para) =

+#. Tag: para
+#: transactions.xml:589
+#, no-c-format
 msgid "<literal>JDBCConnectionException</literal> - indicates an error wit=
h the underlying JDBC communication."
 msgstr ""
 =

-#: transactions.xml:638(para) =

+#. Tag: para
+#: transactions.xml:595
+#, no-c-format
 msgid "<literal>SQLGrammarException</literal> - indicates a grammar or syn=
tax problem with the issued SQL."
 msgstr ""
 =

-#: transactions.xml:644(para) =

+#. Tag: para
+#: transactions.xml:601
+#, no-c-format
 msgid "<literal>ConstraintViolationException</literal> - indicates some fo=
rm of integrity constraint violation."
 msgstr ""
 =

-#: transactions.xml:650(para) =

+#. Tag: para
+#: transactions.xml:607
+#, no-c-format
 msgid "<literal>LockAcquisitionException</literal> - indicates an error ac=
quiring a lock level necessary to perform the requested operation."
 msgstr ""
 =

-#: transactions.xml:656(para) =

+#. Tag: para
+#: transactions.xml:613
+#, no-c-format
 msgid "<literal>GenericJDBCException</literal> - a generic exception which=
 did not fall into any of the other categories."
 msgstr ""
 =

-#: transactions.xml:666(title) =

+#. Tag: title
+#: transactions.xml:623
+#, no-c-format
 msgid "Transaction timeout"
 msgstr ""
 =

-#: transactions.xml:668(para) =

-msgid "One extremely important feature provided by a managed environment l=
ike EJB that is never provided for non-managed code is transaction timeout.=
 Transaction timeouts ensure that no misbehaving transaction can indefinite=
ly tie up resources while returning no response to the user. Outside a mana=
ged (JTA) environment, Hibernate cannot fully provide this functionality. H=
owever, Hibernate can at least control data access operations, ensuring tha=
t database level deadlocks and queries with huge result sets are limited by=
 a defined timeout. In a managed environment, Hibernate can delegate transa=
ction timeout to JTA. This functioanlity is abstracted by the Hibernate <li=
teral>Transaction</literal> object."
+#. Tag: para
+#: transactions.xml:625
+#, no-c-format
+msgid "One extremely important feature provided by a managed environment l=
ike EJB that is never provided for non-managed code is transaction timeout.=
 Transaction timeouts ensure that no misbehaving transaction can indefinite=
ly tie up resources while returning no response to the user. Outside a mana=
ged (JTA) environment, Hibernate cannot fully provide this functionality. H=
owever, Hibernate can at least control data access operations, ensuring tha=
t database level deadlocks and queries with huge result sets are limited by=
 a defined timeout. In a managed environment, Hibernate can delegate transa=
ction timeout to JTA. This functionality is abstracted by the Hibernate <li=
teral>Transaction</literal> object."
 msgstr ""
 =

-#: transactions.xml:701(para) =

+#. Tag: programlisting
+#: transactions.xml:638
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "Session sess =3D factory.openSession();\n"
+      "try {\n"
+      "    //set transaction timeout to 3 seconds\n"
+      "    sess.getTransaction().setTimeout(3);\n"
+      "    sess.getTransaction().begin();\n"
+      "\n"
+      "    // do some work\n"
+      "    ...\n"
+      "\n"
+      "    sess.getTransaction().commit()\n"
+      "}\n"
+      "catch (RuntimeException e) {\n"
+      "    sess.getTransaction().rollback();\n"
+      "    throw e; // or display error message\n"
+      "}\n"
+      "finally {\n"
+      "    sess.close();\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:640
+#, no-c-format
 msgid "Note that <literal>setTimeout()</literal> may not be called in a CM=
T bean, where transaction timeouts must be defined declaratively."
 msgstr ""
 =

-#: transactions.xml:711(title) =

+#. Tag: title
+#: transactions.xml:650
+#, no-c-format
 msgid "Optimistic concurrency control"
 msgstr ""
 =

-#: transactions.xml:713(para) =

+#. Tag: para
+#: transactions.xml:652
+#, no-c-format
 msgid "The only approach that is consistent with high concurrency and high=
 scalability is optimistic concurrency control with versioning. Version che=
cking uses version numbers, or timestamps, to detect conflicting updates (a=
nd to prevent lost updates). Hibernate provides for three possible approach=
es to writing application code that uses optimistic concurrency. The use ca=
ses we show are in the context of long conversations, but version checking =
also has the benefit of preventing lost updates in single database transact=
ions."
 msgstr ""
 =

-#: transactions.xml:724(title) =

+#. Tag: title
+#: transactions.xml:663
+#, no-c-format
 msgid "Application version checking"
 msgstr ""
 =

-#: transactions.xml:726(para) =

+#. Tag: para
+#: transactions.xml:665
+#, no-c-format
 msgid "In an implementation without much help from Hibernate, each interac=
tion with the database occurs in a new <literal>Session</literal> and the d=
eveloper is responsible for reloading all persistent instances from the dat=
abase before manipulating them. This approach forces the application to car=
ry out its own version checking to ensure conversation transaction isolatio=
n. This approach is the least efficient in terms of database access. It is =
the approach most similar to entity EJBs."
 msgstr ""
 =

-#: transactions.xml:747(para) =

+#. Tag: programlisting
+#: transactions.xml:674
+#, no-c-format
+msgid ""
+      "<![CDATA[// foo is an instance loaded by a previous Session\n"
+      "session =3D factory.openSession();\n"
+      "Transaction t =3D session.beginTransaction();\n"
+      "\n"
+      "int oldVersion =3D foo.getVersion();\n"
+      "session.load( foo, foo.getKey() ); // load the current state\n"
+      "if ( oldVersion !=3D foo.getVersion() ) throw new StaleObjectStateE=
xception();\n"
+      "foo.setProperty(\"bar\");\n"
+      "\n"
+      "t.commit();\n"
+      "session.close();]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:676
+#, no-c-format
 msgid "The <literal>version</literal> property is mapped using <literal>&l=
t;version&gt;</literal>, and Hibernate will automatically increment it duri=
ng flush if the entity is dirty."
 msgstr ""
 =

-#: transactions.xml:753(para) =

+#. Tag: para
+#: transactions.xml:682
+#, no-c-format
 msgid "Of course, if you are operating in a low-data-concurrency environme=
nt and don't require version checking, you may use this approach and just s=
kip the version check. In that case, <emphasis>last commit wins</emphasis> =
will be the default strategy for your long conversations. Keep in mind that=
 this might confuse the users of the application, as they might experience =
lost updates without error messages or a chance to merge conflicting change=
s."
 msgstr ""
 =

-#: transactions.xml:762(para) =

-msgid "Clearly, manual version checking is only feasible in very trivial c=
ircumstances and not practical for most applications. Often not only single=
 instances, but complete graphs of modified ojects have to be checked. Hibe=
rnate offers automatic version checking with either an extended <literal>Se=
ssion</literal> or detached instances as the design paradigm."
+#. Tag: para
+#: transactions.xml:691
+#, no-c-format
+msgid "Clearly, manual version checking is only feasible in very trivial c=
ircumstances and not practical for most applications. Often not only single=
 instances, but complete graphs of modified objects have to be checked. Hib=
ernate offers automatic version checking with either an extended <literal>S=
ession</literal> or detached instances as the design paradigm."
 msgstr ""
 =

-#: transactions.xml:773(title) =

+#. Tag: title
+#: transactions.xml:702
+#, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr ""
 =

-#: transactions.xml:775(para) =

+#. Tag: para
+#: transactions.xml:704
+#, no-c-format
 msgid "A single <literal>Session</literal> instance and its persistent ins=
tances are used for the whole conversation, known as <emphasis>session-per-=
conversation</emphasis>. Hibernate checks instance versions at flush time, =
throwing an exception if concurrent modification is detected. It's up to th=
e developer to catch and handle this exception (common options are the oppo=
rtunity for the user to merge changes or to restart the business conversati=
on with non-stale data)."
 msgstr ""
 =

-#: transactions.xml:784(para) =

+#. Tag: para
+#: transactions.xml:713
+#, no-c-format
 msgid "The <literal>Session</literal> is disconnected from any underlying =
JDBC connection when waiting for user interaction. This approach is the mos=
t efficient in terms of database access. The application need not concern i=
tself with version checking or with reattaching detached instances, nor doe=
s it have to reload instances in every database transaction."
 msgstr ""
 =

-#: transactions.xml:800(para) =

+#. Tag: programlisting
+#: transactions.xml:721
+#, no-c-format
+msgid ""
+      "<![CDATA[// foo is an instance loaded earlier by the old session\n"
+      "Transaction t =3D session.beginTransaction(); // Obtain a new JDBC =
connection, start transaction\n"
+      "\n"
+      "foo.setProperty(\"bar\");\n"
+      "\n"
+      "session.flush();    // Only for last transaction in conversation\n"
+      "t.commit();         // Also return JDBC connection\n"
+      "session.close();    // Only for last transaction in conversation]]>"
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:722
+#, no-c-format
 msgid "The <literal>foo</literal> object still knows which <literal>Sessio=
n</literal> it was loaded in. Beginning a new database transaction on an ol=
d session obtains a new connection and resumes the session. Committing a da=
tabase transaction disconnects a session from the JDBC connection and retur=
ns the connection to the pool. After reconnection, to force a version check=
 on data you aren't updating, you may call <literal>Session.lock()</literal=
> with <literal>LockMode.READ</literal> on any objects that might have been=
 updated by another transaction. You don't need to lock any data that you <=
emphasis>are</emphasis> updating. Usually you would set <literal>FlushMode.=
MANUAL</literal> on an extended <literal>Session</literal>, so that only th=
e last database transaction cycle is allowed to actually persist all modifi=
cations made in this conversation. Hence, only this last database transacti=
on would include the <literal>flush()</literal> operation, and then also <l=
iteral>close()!
 </literal> the session to end the conversation."
 msgstr ""
 =

-#: transactions.xml:815(para) =

+#. Tag: para
+#: transactions.xml:737
+#, no-c-format
 msgid "This pattern is problematic if the <literal>Session</literal> is to=
o big to be stored during user think time, e.g. an <literal>HttpSession</li=
teral> should be kept as small as possible. As the <literal>Session</litera=
l> is also the (mandatory) first-level cache and contains all loaded object=
s, we can probably use this strategy only for a few request/response cycles=
. You should use a <literal>Session</literal> only for a single conversatio=
n, as it will soon also have stale data."
 msgstr ""
 =

-#: transactions.xml:825(para) =

+#. Tag: para
+#: transactions.xml:747
+#, no-c-format
 msgid "(Note that earlier Hibernate versions required explicit disconnecti=
on and reconnection of a <literal>Session</literal>. These methods are depr=
ecated, as beginning and ending a transaction has the same effect.)"
 msgstr ""
 =

-#: transactions.xml:831(para) =

+#. Tag: para
+#: transactions.xml:753
+#, no-c-format
 msgid "Also note that you should keep the disconnected <literal>Session</l=
iteral> close to the persistence layer. In other words, use an EJB stateful=
 session bean to hold the <literal>Session</literal> in a three-tier enviro=
nment, and don't transfer it to the web layer (or even serialize it to a se=
parate tier) to store it in the <literal>HttpSession</literal>."
 msgstr ""
 =

-#: transactions.xml:839(para) =

+#. Tag: para
+#: transactions.xml:761
+#, no-c-format
 msgid "The extended session pattern, or <emphasis>session-per-conversation=
</emphasis>, is more difficult to implement with automatic current session =
context management. You need to supply your own implementation of the <lite=
ral>CurrentSessionContext</literal> for this, see the Hibernate Wiki for ex=
amples."
 msgstr ""
 =

-#: transactions.xml:849(title) =

+#. Tag: title
+#: transactions.xml:771
+#, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr ""
 =

-#: transactions.xml:851(para) =

+#. Tag: para
+#: transactions.xml:773
+#, no-c-format
 msgid "Each interaction with the persistent store occurs in a new <literal=
>Session</literal>. However, the same persistent instances are reused for e=
ach interaction with the database. The application manipulates the state of=
 detached instances originally loaded in another <literal>Session</literal>=
 and then reattaches them using <literal>Session.update()</literal>, <liter=
al>Session.saveOrUpdate()</literal>, or <literal>Session.merge()</literal>."
 msgstr ""
 =

-#: transactions.xml:867(para) =

-msgid "Again, Hibernate will check instance versions during flush, throwin=
g an exception if conflicting updates occured."
+#. Tag: programlisting
+#: transactions.xml:781
+#, no-c-format
+msgid ""
+      "<![CDATA[// foo is an instance loaded by a previous Session\n"
+      "foo.setProperty(\"bar\");\n"
+      "session =3D factory.openSession();\n"
+      "Transaction t =3D session.beginTransaction();\n"
+      "session.saveOrUpdate(foo); // Use merge() if \"foo\" might have bee=
n loaded already\n"
+      "t.commit();\n"
+      "session.close();]]>"
 msgstr ""
 =

-#: transactions.xml:872(para) =

+#. Tag: para
+#: transactions.xml:783
+#, no-c-format
+msgid "Again, Hibernate will check instance versions during flush, throwin=
g an exception if conflicting updates occurred."
+msgstr ""
+
+#. Tag: para
+#: transactions.xml:788
+#, no-c-format
 msgid "You may also call <literal>lock()</literal> instead of <literal>upd=
ate()</literal> and use <literal>LockMode.READ</literal> (performing a vers=
ion check, bypassing all caches) if you are sure that the object has not be=
en modified."
 msgstr ""
 =

-#: transactions.xml:881(title) =

+#. Tag: title
+#: transactions.xml:797
+#, no-c-format
 msgid "Customizing automatic versioning"
 msgstr ""
 =

-#: transactions.xml:883(para) =

+#. Tag: para
+#: transactions.xml:799
+#, no-c-format
 msgid "You may disable Hibernate's automatic version increment for particu=
lar properties and collections by setting the <literal>optimistic-lock</lit=
eral> mapping attribute to <literal>false</literal>. Hibernate will then no=
 longer increment versions if the property is dirty."
 msgstr ""
 =

-#: transactions.xml:890(para) =

-msgid "Legacy database schemas are often static and can't be modified. Or,=
 other applications might also access the same database and don't know how =
to handle version numbers or even timestamps. In both cases, versioning can=
't rely on a particular column in a table. To force a version check without=
 a version or timestamp property mapping, with a comparison of the state of=
 all fields in a row, turn on <literal>optimistic-lock=3D\"all\"</literal> =
in the <literal>&lt;class&gt;</literal> mapping. Note that this concepetual=
ly only works if Hibernate can compare the old and new state, i.e. if you u=
se a single long <literal>Session</literal> and not session-per-request-wit=
h-detached-objects."
+#. Tag: para
+#: transactions.xml:806
+#, no-c-format
+msgid "Legacy database schemas are often static and can't be modified. Or,=
 other applications might also access the same database and don't know how =
to handle version numbers or even timestamps. In both cases, versioning can=
't rely on a particular column in a table. To force a version check without=
 a version or timestamp property mapping, with a comparison of the state of=
 all fields in a row, turn on <literal>optimistic-lock=3D\"all\"</literal> =
in the <literal>&lt;class&gt;</literal> mapping. Note that this conceptuall=
y only works if Hibernate can compare the old and new state, i.e. if you us=
e a single long <literal>Session</literal> and not session-per-request-with=
-detached-objects."
 msgstr ""
 =

-#: transactions.xml:901(para) =

+#. Tag: para
+#: transactions.xml:817
+#, no-c-format
 msgid "Sometimes concurrent modification can be permitted as long as the c=
hanges that have been made don't overlap. If you set <literal>optimistic-lo=
ck=3D\"dirty\"</literal> when mapping the <literal>&lt;class&gt;</literal>,=
 Hibernate will only compare dirty fields during flush."
 msgstr ""
 =

-#: transactions.xml:907(para) =

-msgid "In both cases, with dedicated version/timestamp columns or with ful=
l/dirty field comparison, Hibernate uses a single <literal>UPDATE</literal>=
 statement (with an appropriate <literal>WHERE</literal> clause) per entity=
 to execute the version check and update the information. If you use transi=
tive persistence to cascade reattachment to associated entities, Hibernate =
might execute uneccessary updates. This is usually not a problem, but <emph=
asis>on update</emphasis> triggers in the database might be executed even w=
hen no changes have been made to detached instances. You can customize this=
 behavior by setting <literal>select-before-update=3D\"true\"</literal> in =
the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate to <literal=
>SELECT</literal> the instance to ensure that changes did actually occur, b=
efore updating the row."
+#. Tag: para
+#: transactions.xml:823
+#, no-c-format
+msgid "In both cases, with dedicated version/timestamp columns or with ful=
l/dirty field comparison, Hibernate uses a single <literal>UPDATE</literal>=
 statement (with an appropriate <literal>WHERE</literal> clause) per entity=
 to execute the version check and update the information. If you use transi=
tive persistence to cascade reattachment to associated entities, Hibernate =
might execute unnecessary updates. This is usually not a problem, but <emph=
asis>on update</emphasis> triggers in the database might be executed even w=
hen no changes have been made to detached instances. You can customize this=
 behavior by setting <literal>select-before-update=3D\"true\"</literal> in =
the <literal>&lt;class&gt;</literal> mapping, forcing Hibernate to <literal=
>SELECT</literal> the instance to ensure that changes did actually occur, b=
efore updating the row."
 msgstr ""
 =

-#: transactions.xml:925(title) =

+#. Tag: title
+#: transactions.xml:841
+#, no-c-format
 msgid "Pessimistic Locking"
 msgstr ""
 =

-#: transactions.xml:927(para) =

-msgid "It is not intended that users spend much time worring about locking=
 strategies. Its usually enough to specify an isolation level for the JDBC =
connections and then simply let the database do all the work. However, adva=
nced users may sometimes wish to obtain exclusive pessimistic locks, or re-=
obtain locks at the start of a new transaction."
+#. Tag: para
+#: transactions.xml:843
+#, no-c-format
+msgid "It is not intended that users spend much time worrying about lockin=
g strategies. It's usually enough to specify an isolation level for the JDB=
C connections and then simply let the database do all the work. However, ad=
vanced users may sometimes wish to obtain exclusive pessimistic locks, or r=
e-obtain locks at the start of a new transaction."
 msgstr ""
 =

-#: transactions.xml:934(para) =

+#. Tag: para
+#: transactions.xml:850
+#, no-c-format
 msgid "Hibernate will always use the locking mechanism of the database, ne=
ver lock objects in memory!"
 msgstr ""
 =

-#: transactions.xml:939(para) =

+#. Tag: para
+#: transactions.xml:855
+#, no-c-format
 msgid "The <literal>LockMode</literal> class defines the different lock le=
vels that may be acquired by Hibernate. A lock is obtained by the following=
 mechanisms:"
 msgstr ""
 =

-#: transactions.xml:946(para) =

+#. Tag: para
+#: transactions.xml:862
+#, no-c-format
 msgid "<literal>LockMode.WRITE</literal> is acquired automatically when Hi=
bernate updates or inserts a row."
 msgstr ""
 =

-#: transactions.xml:952(para) =

+#. Tag: para
+#: transactions.xml:868
+#, no-c-format
 msgid "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit u=
ser request using <literal>SELECT ... FOR UPDATE</literal> on databases whi=
ch support that syntax."
 msgstr ""
 =

-#: transactions.xml:958(para) =

+#. Tag: para
+#: transactions.xml:874
+#, no-c-format
 msgid "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon exp=
licit user request using a <literal>SELECT ... FOR UPDATE NOWAIT</literal> =
under Oracle."
 msgstr ""
 =

-#: transactions.xml:964(para) =

+#. Tag: para
+#: transactions.xml:880
+#, no-c-format
 msgid "<literal>LockMode.READ</literal> is acquired automatically when Hib=
ernate reads data under Repeatable Read or Serializable isolation level. Ma=
y be re-acquired by explicit user request."
 msgstr ""
 =

-#: transactions.xml:971(para) =

+#. Tag: para
+#: transactions.xml:887
+#, no-c-format
 msgid "<literal>LockMode.NONE</literal> represents the absence of a lock. =
All objects switch to this lock mode at the end of a <literal>Transaction</=
literal>. Objects associated with the session via a call to <literal>update=
()</literal> or <literal>saveOrUpdate()</literal> also start out in this lo=
ck mode."
 msgstr ""
 =

-#: transactions.xml:980(para) =

+#. Tag: para
+#: transactions.xml:896
+#, no-c-format
 msgid "The \"explicit user request\" is expressed in one of the following =
ways:"
 msgstr ""
 =

-#: transactions.xml:986(para) =

+#. Tag: para
+#: transactions.xml:902
+#, no-c-format
 msgid "A call to <literal>Session.load()</literal>, specifying a <literal>=
LockMode</literal>."
 msgstr ""
 =

-#: transactions.xml:991(para) =

+#. Tag: para
+#: transactions.xml:907
+#, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr ""
 =

-#: transactions.xml:996(para) =

+#. Tag: para
+#: transactions.xml:912
+#, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr ""
 =

-#: transactions.xml:1002(para) =

+#. Tag: para
+#: transactions.xml:918
+#, no-c-format
 msgid "If <literal>Session.load()</literal> is called with <literal>UPGRAD=
E</literal> or <literal>UPGRADE_NOWAIT</literal>, and the requested object =
was not yet loaded by the session, the object is loaded using <literal>SELE=
CT ... FOR UPDATE</literal>. If <literal>load()</literal> is called for an =
object that is already loaded with a less restrictive lock than the one req=
uested, Hibernate calls <literal>lock()</literal> for that object."
 msgstr ""
 =

-#: transactions.xml:1011(para) =

+#. Tag: para
+#: transactions.xml:927
+#, no-c-format
 msgid "<literal>Session.lock()</literal> performs a version number check i=
f the specified lock mode is <literal>READ</literal>, <literal>UPGRADE</lit=
eral> or <literal>UPGRADE_NOWAIT</literal>. (In the case of <literal>UPGRAD=
E</literal> or <literal>UPGRADE_NOWAIT</literal>, <literal>SELECT ... FOR U=
PDATE</literal> is used.)"
 msgstr ""
 =

-#: transactions.xml:1018(para) =

+#. Tag: para
+#: transactions.xml:934
+#, no-c-format
 msgid "If the database does not support the requested lock mode, Hibernate=
 will use an appropriate alternate mode (instead of throwing an exception).=
 This ensures that applications will be portable."
 msgstr ""
 =

-#: transactions.xml:1027(title) =

+#. Tag: title
+#: transactions.xml:943
+#, no-c-format
 msgid "Connection Release Modes"
 msgstr ""
 =

-#: transactions.xml:1029(para) =

+#. Tag: para
+#: transactions.xml:945
+#, no-c-format
 msgid "The legacy (2.x) behavior of Hibernate in regards to JDBC connectio=
n management was that a <literal>Session</literal> would obtain a connectio=
n when it was first needed and then hold unto that connection until the ses=
sion was closed. Hibernate 3.x introduced the notion of connection release =
modes to tell a session how to handle its JDBC connections. Note that the f=
ollowing discussion is pertinent only to connections provided through a con=
figured <literal>ConnectionProvider</literal>; user-supplied connections ar=
e outside the breadth of this discussion. The different release modes are i=
dentified by the enumerated values of <literal>org.hibernate.ConnectionRele=
aseMode</literal>:"
 msgstr ""
 =

-#: transactions.xml:1043(para) =

-msgid "<literal>ON_CLOSE</literal> - is essentially the legacy behavior de=
scribed above. The Hibernate session obatins a connection when it first nee=
ds to perform some JDBC access and holds unto that connection until the ses=
sion is closed."
+#. Tag: para
+#: transactions.xml:959
+#, no-c-format
+msgid "<literal>ON_CLOSE</literal> - is essentially the legacy behavior de=
scribed above. The Hibernate session obtains a connection when it first nee=
ds to perform some JDBC access and holds unto that connection until the ses=
sion is closed."
 msgstr ""
 =

-#: transactions.xml:1050(para) =

+#. Tag: para
+#: transactions.xml:966
+#, no-c-format
 msgid "<literal>AFTER_TRANSACTION</literal> - says to release connections =
after a <literal>org.hibernate.Transaction</literal> has completed."
 msgstr ""
 =

-#: transactions.xml:1056(para) =

+#. Tag: para
+#: transactions.xml:972
+#, no-c-format
 msgid "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive =
release) - says to release connections after each and every statement execu=
tion. This aggressive releasing is skipped if that statement leaves open re=
sources associated with the given session; currently the only situation whe=
re this occurs is through the use of <literal>org.hibernate.ScrollableResul=
ts</literal>."
 msgstr ""
 =

-#: transactions.xml:1066(para) =

+#. Tag: para
+#: transactions.xml:982
+#, no-c-format
 msgid "The configuration parameter <literal>hibernate.connection.release_m=
ode</literal> is used to specify which release mode to use. The possible va=
lues:"
 msgstr ""
 =

-#: transactions.xml:1073(para) =

+#. Tag: para
+#: transactions.xml:989
+#, no-c-format
 msgid "<literal>auto</literal> (the default) - this choice delegates to th=
e release mode returned by the <literal>org.hibernate.transaction.Transacti=
onFactory.getDefaultReleaseMode()</literal> method. For JTATransactionFacto=
ry, this returns ConnectionReleaseMode.AFTER_STATEMENT; for JDBCTransaction=
Factory, this returns ConnectionReleaseMode.AFTER_TRANSACTION. It is rarely=
 a good idea to change this default behavior as failures due to the value o=
f this setting tend to indicate bugs and/or invalid assumptions in user cod=
e."
 msgstr ""
 =

-#: transactions.xml:1083(para) =

+#. Tag: para
+#: transactions.xml:999
+#, no-c-format
 msgid "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_=
CLOSE. This setting is left for backwards compatibility, but its use is hig=
hly discouraged."
 msgstr ""
 =

-#: transactions.xml:1089(para) =

+#. Tag: para
+#: transactions.xml:1005
+#, no-c-format
 msgid "<literal>after_transaction</literal> - says to use ConnectionReleas=
eMode.AFTER_TRANSACTION. This setting should not be used in JTA environment=
s. Also note that with ConnectionReleaseMode.AFTER_TRANSACTION, if a sessio=
n is considered to be in auto-commit mode connections will be released as i=
f the release mode were AFTER_STATEMENT."
 msgstr ""
 =

-#: transactions.xml:1097(para) =

+#. Tag: para
+#: transactions.xml:1013
+#, no-c-format
 msgid "<literal>after_statement</literal> - says to use ConnectionReleaseM=
ode.AFTER_STATEMENT. Additionally, the configured <literal>ConnectionProvid=
er</literal> is consulted to see if it supports this setting (<literal>supp=
ortsAggressiveRelease()</literal>). If not, the release mode is reset to Co=
nnectionReleaseMode.AFTER_TRANSACTION. This setting is only safe in environ=
ments where we can either re-acquire the same underlying JDBC connection ea=
ch time we make a call into <literal>ConnectionProvider.getConnection()</li=
teral> or in auto-commit environments where it does not matter whether we g=
et back the same connection."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: transactions.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/tuto=
rial.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.p=
ot	2008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.p=
ot	2008-05-07 21:02:35 UTC (rev 14653)
@@ -1,568 +1,1681 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:35-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: tutorial.xml:7(title) =

+#. Tag: title
+#: tutorial.xml:31
+#, no-c-format
 msgid "Introduction to Hibernate"
 msgstr ""
 =

-#: tutorial.xml:10(title) =

+#. Tag: title
+#: tutorial.xml:34
+#, no-c-format
 msgid "Preface"
 msgstr ""
 =

-#: tutorial.xml:12(para) =

+#. Tag: para
+#: tutorial.xml:36
+#, no-c-format
 msgid "This chapter is an introductory tutorial for new users of Hibernate=
. We start with a simple command line application using an in-memory databa=
se and develop it in easy to understand steps."
 msgstr ""
 =

-#: tutorial.xml:18(para) =

+#. Tag: para
+#: tutorial.xml:42
+#, no-c-format
 msgid "This tutorial is intended for new users of Hibernate but requires J=
ava and SQL knowledge. It is based on a tutorial by Michael Gloegl, the thi=
rd-party libraries we name are for JDK 1.4 and 5.0. You might need others f=
or JDK 1.3."
 msgstr ""
 =

-#: tutorial.xml:24(para) =

+#. Tag: para
+#: tutorial.xml:48
+#, no-c-format
 msgid "The source code for the tutorial is included in the distribution in=
 the <literal>doc/reference/tutorial/</literal> directory."
 msgstr ""
 =

-#: tutorial.xml:32(title) =

+#. Tag: title
+#: tutorial.xml:56
+#, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr ""
 =

-#: tutorial.xml:34(para) =

+#. Tag: para
+#: tutorial.xml:58
+#, no-c-format
 msgid "First, we'll create a simple console-based Hibernate application. W=
e use an Java database (HSQL DB), so we do not have to install any database=
 server."
 msgstr ""
 =

-#: tutorial.xml:39(para) =

+#. Tag: para
+#: tutorial.xml:63
+#, no-c-format
 msgid "Let's assume we need a small database application that can store ev=
ents we want to attend, and information about the hosts of these events."
 msgstr ""
 =

-#: tutorial.xml:44(para) =

+#. Tag: para
+#: tutorial.xml:68
+#, no-c-format
 msgid "The first thing we do, is set up our development directory and put =
all the Java libraries we need into it. Download the Hibernate distribution=
 from the Hibernate website. Extract the package and place all required lib=
raries found in <literal>/lib</literal> into into the <literal>/lib</litera=
l> directory of your new development working directory. It should look like=
 this:"
 msgstr ""
 =

-#: tutorial.xml:65(para) =

+#. Tag: programlisting
+#: tutorial.xml:76
+#, no-c-format
+msgid ""
+      "<![CDATA[.\n"
+      "+lib\n"
+      "  antlr.jar\n"
+      "  cglib.jar\n"
+      "  asm.jar\n"
+      "  asm-attrs.jars\n"
+      "  commons-collections.jar\n"
+      "  commons-logging.jar\n"
+      "  hibernate3.jar\n"
+      "  jta.jar\n"
+      "  dom4j.jar\n"
+      "  log4j.jar ]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:78
+#, no-c-format
 msgid "This is the minimum set of required libraries (note that we also co=
pied hibernate3.jar, the main archive) for Hibernate <emphasis>at the time =
of writing</emphasis>. The Hibernate release you are using might require mo=
re or less libraries. See the <literal>README.txt</literal> file in the <li=
teral>lib/</literal> directory of the Hibernate distribution for more infor=
mation about required and optional third-party libraries. (Actually, Log4j =
is not required but preferred by many developers.)"
 msgstr ""
 =

-#: tutorial.xml:74(para) =

+#. Tag: para
+#: tutorial.xml:87
+#, no-c-format
 msgid "Next we create a class that represents the event we want to store i=
n database."
 msgstr ""
 =

-#: tutorial.xml:79(title) =

+#. Tag: title
+#: tutorial.xml:92
+#, no-c-format
 msgid "The first class"
 msgstr ""
 =

-#: tutorial.xml:81(para) =

+#. Tag: para
+#: tutorial.xml:94
+#, no-c-format
 msgid "Our first persistent class is a simple JavaBean class with some pro=
perties:"
 msgstr ""
 =

-#: tutorial.xml:122(para) =

+#. Tag: programlisting
+#: tutorial.xml:98
+#, no-c-format
+msgid ""
+      "<![CDATA[package events;\n"
+      "\n"
+      "import java.util.Date;\n"
+      "\n"
+      "public class Event {\n"
+      "    private Long id;\n"
+      "\n"
+      "    private String title;\n"
+      "    private Date date;\n"
+      "\n"
+      "    public Event() {}\n"
+      "\n"
+      "    public Long getId() {\n"
+      "        return id;\n"
+      "    }\n"
+      "\n"
+      "    private void setId(Long id) {\n"
+      "        this.id =3D id;\n"
+      "    }\n"
+      "\n"
+      "    public Date getDate() {\n"
+      "        return date;\n"
+      "    }\n"
+      "\n"
+      "    public void setDate(Date date) {\n"
+      "        this.date =3D date;\n"
+      "    }\n"
+      "\n"
+      "    public String getTitle() {\n"
+      "        return title;\n"
+      "    }\n"
+      "\n"
+      "    public void setTitle(String title) {\n"
+      "        this.title =3D title;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:100
+#, no-c-format
 msgid "You can see that this class uses standard JavaBean naming conventio=
ns for property getter and setter methods, as well as private visibility fo=
r the fields. This is a recommended design - but not required. Hibernate ca=
n also access fields directly, the benefit of accessor methods is robustnes=
s for refactoring. The no-argument constructor is required to instantiate a=
n object of this class through reflection."
 msgstr ""
 =

-#: tutorial.xml:130(para) =

+#. Tag: para
+#: tutorial.xml:108
+#, no-c-format
 msgid "The <literal>id</literal> property holds a unique identifier value =
for a particular event. All persistent entity classes (there are less impor=
tant dependent classes as well) will need such an identifier property if we=
 want to use the full feature set of Hibernate. In fact, most applications =
(esp. web applications) need to distinguish objects by identifier, so you s=
hould consider this a feature rather than a limitation. However, we usually=
 don't manipulate the identity of an object, hence the setter method should=
 be private. Only Hibernate will assign identifiers when an object is saved=
. You can see that Hibernate can access public, private, and protected acce=
ssor methods, as well as (public, private, protected) fields directly. The =
choice is up to you and you can match it to fit your application design."
 msgstr ""
 =

-#: tutorial.xml:142(para) =

+#. Tag: para
+#: tutorial.xml:120
+#, no-c-format
 msgid "The no-argument constructor is a requirement for all persistent cla=
sses; Hibernate has to create objects for you, using Java Reflection. The c=
onstructor can be private, however, package visibility is required for runt=
ime proxy generation and efficient data retrieval without bytecode instrume=
ntation."
 msgstr ""
 =

-#: tutorial.xml:149(para) =

+#. Tag: para
+#: tutorial.xml:127
+#, no-c-format
 msgid "Place this Java source file in a directory called <literal>src</lit=
eral> in the development folder, and in its correct package. The directory =
should now look like this:"
 msgstr ""
 =

-#: tutorial.xml:161(para) =

+#. Tag: programlisting
+#: tutorial.xml:132
+#, no-c-format
+msgid ""
+      "<![CDATA[.\n"
+      "+lib\n"
+      "  <Hibernate and third-party libraries>\n"
+      "+src\n"
+      "  +events\n"
+      "    Event.java]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:134
+#, no-c-format
 msgid "In the next step, we tell Hibernate about this persistent class."
 msgstr ""
 =

-#: tutorial.xml:168(title) =

+#. Tag: title
+#: tutorial.xml:141
+#, no-c-format
 msgid "The mapping file"
 msgstr ""
 =

-#: tutorial.xml:170(para) =

+#. Tag: para
+#: tutorial.xml:143
+#, no-c-format
 msgid "Hibernate needs to know how to load and store objects of the persis=
tent class. This is where the Hibernate mapping file comes into play. The m=
apping file tells Hibernate what table in the database it has to access, an=
d what columns in that table it should use."
 msgstr ""
 =

-#: tutorial.xml:177(para) =

+#. Tag: para
+#: tutorial.xml:150
+#, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr ""
 =

-#: tutorial.xml:190(para) =

+#. Tag: programlisting
+#: tutorial.xml:154
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\"?>\n"
+      "<!DOCTYPE hibernate-mapping PUBLIC\n"
+      "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
+      "        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dt=
d\">\n"
+      "\n"
+      "<hibernate-mapping>\n"
+      "[...]\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:156
+#, no-c-format
 msgid "Note that the Hibernate DTD is very sophisticated. You can use it f=
or auto-completion of XML mapping elements and attributes in your editor or=
 IDE. You also should open up the DTD file in your text editor - it's the e=
asiest way to get an overview of all elements and attributes and to see the=
 defaults, as well as some comments. Note that Hibernate will not load the =
DTD file from the web, but first look it up from the classpath of the appli=
cation. The DTD file is included in <literal>hibernate3.jar</literal> as we=
ll as in the <literal>src/</literal> directory of the Hibernate distributio=
n."
 msgstr ""
 =

-#: tutorial.xml:201(para) =

+#. Tag: para
+#: tutorial.xml:167
+#, no-c-format
 msgid "We will omit the DTD declaration in future examples to shorten the =
code. It is of course not optional."
 msgstr ""
 =

-#: tutorial.xml:206(para) =

+#. Tag: para
+#: tutorial.xml:172
+#, no-c-format
 msgid "Between the two <literal>hibernate-mapping</literal> tags, include =
a <literal>class</literal> element. All persistent entity classes (again, t=
here might be dependent classes later on, which are not first-class entitie=
s) need such a mapping, to a table in the SQL database:"
 msgstr ""
 =

-#: tutorial.xml:221(para) =

+#. Tag: programlisting
+#: tutorial.xml:179
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"events.Event\" table=3D\"EVENTS\">\n"
+      "\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:181
+#, no-c-format
 msgid "So far we told Hibernate how to persist and load object of class <l=
iteral>Event</literal> to the table <literal>EVENTS</literal>, each instanc=
e represented by a row in that table. Now we continue with a mapping of the=
 unique identifier property to the tables primary key. In addition, as we d=
on't want to care about handling this identifier, we configure Hibernate's =
identifier generation strategy for a surrogate primary key column:"
 msgstr ""
 =

-#: tutorial.xml:239(para) =

-msgid "The <literal>id</literal> element is the declaration of the identif=
er property, <literal>name=3D\"id\"</literal> declares the name of the Java=
 property - Hibernate will use the getter and setter methods to access the =
property. The column attribute tells Hibernate which column of the <literal=
>EVENTS</literal> table we use for this primary key. The nested <literal>ge=
nerator</literal> element specifies the identifier generation strategy, in =
this case we used <literal>native</literal>, which picks the best strategy =
depending on the configured database (dialect). Hibernate supports database=
 generated, globally unique, as well as application assigned identifiers (o=
r any strategy you have written an extension for)."
+#. Tag: programlisting
+#: tutorial.xml:189
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"events.Event\" table=3D\"EVENTS\">\n"
+      "        <id name=3D\"id\" column=3D\"EVENT_ID\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
 msgstr ""
 =

-#: tutorial.xml:252(para) =

+#. Tag: para
+#: tutorial.xml:191
+#, no-c-format
+msgid "The <literal>id</literal> element is the declaration of the identif=
ier property, <literal>name=3D\"id\"</literal> declares the name of the Jav=
a property - Hibernate will use the getter and setter methods to access the=
 property. The column attribute tells Hibernate which column of the <litera=
l>EVENTS</literal> table we use for this primary key. The nested <literal>g=
enerator</literal> element specifies the identifier generation strategy, in=
 this case we used <literal>native</literal>, which picks the best strategy=
 depending on the configured database (dialect). Hibernate supports databas=
e generated, globally unique, as well as application assigned identifiers (=
or any strategy you have written an extension for)."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:204
+#, no-c-format
 msgid "Finally we include declarations for the persistent properties of th=
e class in the mapping file. By default, no properties of the class are con=
sidered persistent:"
 msgstr ""
 =

-#: tutorial.xml:271(para) =

+#. Tag: programlisting
+#: tutorial.xml:210
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"events.Event\" table=3D\"EVENTS\">\n"
+      "        <id name=3D\"id\" column=3D\"EVENT_ID\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"date\" type=3D\"timestamp\" column=3D\"E=
VENT_DATE\"/>\n"
+      "        <property name=3D\"title\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:212
+#, no-c-format
 msgid "Just as with the <literal>id</literal> element, the <literal>name</=
literal> attribute of the <literal>property</literal> element tells Hiberna=
te which getter and setter methods to use. So, in this case, Hibernate will=
 look for <literal>getDate()/setDate()</literal>, as well as <literal>getTi=
tle()/setTitle()</literal>."
 msgstr ""
 =

-#: tutorial.xml:278(para) =

+#. Tag: para
+#: tutorial.xml:219
+#, no-c-format
 msgid "Why does the <literal>date</literal> property mapping include the <=
literal>column</literal> attribute, but the <literal>title</literal> doesn'=
t? Without the <literal>column</literal> attribute Hibernate by default use=
s the property name as the column name. This works fine for <literal>title<=
/literal>. However, <literal>date</literal> is a reserved keyword in most d=
atabase, so we better map it to a different name."
 msgstr ""
 =

-#: tutorial.xml:287(para) =

+#. Tag: para
+#: tutorial.xml:228
+#, no-c-format
 msgid "The next interesting thing is that the <literal>title</literal> map=
ping also lacks a <literal>type</literal> attribute. The types we declare a=
nd use in the mapping files are not, as you might expect, Java data types. =
They are also not SQL database types. These types are so called <emphasis>H=
ibernate mapping types</emphasis>, converters which can translate from Java=
 to SQL data types and vice versa. Again, Hibernate will try to determine t=
he correct conversion and mapping type itself if the <literal>type</literal=
> attribute is not present in the mapping. In some cases this automatic det=
ection (using Reflection on the Java class) might not have the default you =
expect or need. This is the case with the <literal>date</literal> property.=
 Hibernate can't know if the property (which is of <literal>java.util.Date<=
/literal>) should map to a SQL <literal>date</literal>, <literal>timestamp<=
/literal>, or <literal>time</literal> column. We preserve full date and tim=
e information !
 by mapping the property with a <literal>timestamp</literal> converter."
 msgstr ""
 =

-#: tutorial.xml:303(para) =

+#. Tag: para
+#: tutorial.xml:244
+#, no-c-format
 msgid "This mapping file should be saved as <literal>Event.hbm.xml</litera=
l>, right in the directory next to the <literal>Event</literal> Java class =
source file. The naming of mapping files can be arbitrary, however the <lit=
eral>hbm.xml</literal> suffix is a convention in the Hibernate developer co=
mmunity. The directory structure should now look like this:"
 msgstr ""
 =

-#: tutorial.xml:319(para) =

+#. Tag: programlisting
+#: tutorial.xml:252
+#, no-c-format
+msgid ""
+      "<![CDATA[.\n"
+      "+lib\n"
+      "  <Hibernate and third-party libraries>\n"
+      "+src\n"
+      "  +events\n"
+      "    Event.java\n"
+      "    Event.hbm.xml]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:254
+#, no-c-format
 msgid "We continue with the main configuration of Hibernate."
 msgstr ""
 =

-#: tutorial.xml:326(title) =

+#. Tag: title
+#: tutorial.xml:261
+#, no-c-format
 msgid "Hibernate configuration"
 msgstr ""
 =

-#: tutorial.xml:328(para) =

+#. Tag: para
+#: tutorial.xml:263
+#, no-c-format
 msgid "We now have a persistent class and its mapping file in place. It is=
 time to configure Hibernate. Before we do this, we will need a database. H=
SQL DB, a java-based SQL DBMS, can be downloaded from the HSQL DB website(h=
ttp://hsqldb.org/). Actually, you only need the <literal>hsqldb.jar</litera=
l> from this download. Place this file in the <literal>lib/</literal> direc=
tory of the development folder."
 msgstr ""
 =

-#: tutorial.xml:336(para) =

+#. Tag: para
+#: tutorial.xml:271
+#, no-c-format
 msgid "Create a directory called <literal>data</literal> in the root of th=
e development directory - this is where HSQL DB will store its data files. =
Now start the database by running <literal>java -classpath ../lib/hsqldb.ja=
r org.hsqldb.Server</literal> in this data directory. You can see it start =
up and bind to a TCP/IP socket, this is where our application will connect =
later. If you want to start with a fresh database during this tutorial, shu=
tdown HSQL DB (press <literal>CTRL + C</literal> in the window), delete all=
 files in the <literal>data/</literal> directory, and start HSQL DB again."
 msgstr ""
 =

-#: tutorial.xml:346(para) =

+#. Tag: para
+#: tutorial.xml:281
+#, no-c-format
 msgid "Hibernate is the layer in your application which connects to this d=
atabase, so it needs connection information. The connections are made throu=
gh a JDBC connection pool, which we also have to configure. The Hibernate d=
istribution contains several open source JDBC connection pooling tools, but=
 will use the Hibernate built-in connection pool for this tutorial. Note th=
at you have to copy the required library into your classpath and use differ=
ent connection pooling settings if you want to use a production-quality thi=
rd party JDBC pooling software."
 msgstr ""
 =

-#: tutorial.xml:356(para) =

+#. Tag: para
+#: tutorial.xml:291
+#, no-c-format
 msgid "For Hibernate's configuration, we can use a simple <literal>hiberna=
te.properties</literal> file, a slightly more sophisticated <literal>hibern=
ate.cfg.xml</literal> file, or even complete programmatic setup. Most users=
 prefer the XML configuration file:"
 msgstr ""
 =

-#: tutorial.xml:401(para) =

+#. Tag: programlisting
+#: tutorial.xml:297
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D'1.0' encoding=3D'utf-8'?>\n"
+      "<!DOCTYPE hibernate-configuration PUBLIC\n"
+      "        \"-//Hibernate/Hibernate Configuration DTD 3.0//EN\"\n"
+      "        \"http://hibernate.sourceforge.net/hibernate-configuration-=
3.0.dtd\">\n"
+      "\n"
+      "<hibernate-configuration>\n"
+      "\n"
+      "    <session-factory>\n"
+      "\n"
+      "        <!-- Database connection settings -->\n"
+      "        <property name=3D\"connection.driver_class\">org.hsqldb.jdb=
cDriver</property>\n"
+      "        <property name=3D\"connection.url\">jdbc:hsqldb:hsql://loca=
lhost</property>\n"
+      "        <property name=3D\"connection.username\">sa</property>\n"
+      "        <property name=3D\"connection.password\"></property>\n"
+      "\n"
+      "        <!-- JDBC connection pool (use the built-in) -->\n"
+      "        <property name=3D\"connection.pool_size\">1</property>\n"
+      "\n"
+      "        <!-- SQL dialect -->\n"
+      "        <property name=3D\"dialect\">org.hibernate.dialect.HSQLDial=
ect</property>\n"
+      "\n"
+      "        <!-- Enable Hibernate's automatic session context managemen=
t -->\n"
+      "        <property name=3D\"current_session_context_class\">thread</=
property>\n"
+      "\n"
+      "        <!-- Disable the second-level cache  -->\n"
+      "        <property name=3D\"cache.provider_class\">org.hibernate.cac=
he.NoCacheProvider</property>\n"
+      "\n"
+      "        <!-- Echo all executed SQL to stdout -->\n"
+      "        <property name=3D\"show_sql\">true</property>\n"
+      "\n"
+      "        <!-- Drop and re-create the database schema on startup -->\=
n"
+      "        <property name=3D\"hbm2ddl.auto\">create</property>\n"
+      "\n"
+      "        <mapping resource=3D\"events/Event.hbm.xml\"/>\n"
+      "\n"
+      "    </session-factory>\n"
+      "\n"
+      "</hibernate-configuration>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:299
+#, no-c-format
 msgid "Note that this XML configuration uses a different DTD. We configure=
 Hibernate's <literal>SessionFactory</literal> - a global factory responsib=
le for a particular database. If you have several databases, use several <l=
iteral>&lt;session-factory&gt;</literal> configurations, usually in several=
 configuration files (for easier startup)."
 msgstr ""
 =

-#: tutorial.xml:409(para) =

+#. Tag: para
+#: tutorial.xml:307
+#, no-c-format
 msgid "The first four <literal>property</literal> elements contain the nec=
essary configuration for the JDBC connection. The dialect <literal>property=
</literal> element specifies the particular SQL variant Hibernate generates=
. Hibernate's automatic session management for persistence contexts will co=
me in handy as you will soon see. The <literal>hbm2ddl.auto</literal> optio=
n turns on automatic generation of database schemas - directly into the dat=
abase. This can of course also be turned off (by removing the config option=
) or redirected to a file with the help of the <literal>SchemaExport</liter=
al> Ant task. Finally, we add the mapping file(s) for persistent classes to=
 the configuration."
 msgstr ""
 =

-#: tutorial.xml:422(para) =

+#. Tag: para
+#: tutorial.xml:320
+#, no-c-format
 msgid "Copy this file into the source directory, so it will end up in the =
root of the classpath. Hibernate automatically looks for a file called <lit=
eral>hibernate.cfg.xml</literal> in the root of the classpath, on startup."
 msgstr ""
 =

-#: tutorial.xml:431(title) =

+#. Tag: title
+#: tutorial.xml:329
+#, no-c-format
 msgid "Building with Ant"
 msgstr ""
 =

-#: tutorial.xml:433(para) =

+#. Tag: para
+#: tutorial.xml:331
+#, no-c-format
 msgid "We'll now build the tutorial with Ant. You will need to have Ant in=
stalled - get it from the <ulink url=3D\"http://ant.apache.org/bindownload.=
cgi\">Ant download page</ulink>. How to install Ant will not be covered her=
e. Please refer to the <ulink url=3D\"http://ant.apache.org/manual/index.ht=
ml\">Ant manual</ulink>. After you have installed Ant, we can start to crea=
te the buildfile. It will be called <literal>build.xml</literal> and placed=
 directly in the development directory."
 msgstr ""
 =

-#: tutorial.xml:442(para) =

+#. Tag: para
+#: tutorial.xml:340
+#, no-c-format
 msgid "A basic build file looks like this:"
 msgstr ""
 =

-#: tutorial.xml:479(para) =

+#. Tag: programlisting
+#: tutorial.xml:344
+#, no-c-format
+msgid ""
+      "<![CDATA[<project name=3D\"hibernate-tutorial\" default=3D\"compile=
\">\n"
+      "\n"
+      "    <property name=3D\"sourcedir\" value=3D\"${basedir}/src\"/>\n"
+      "    <property name=3D\"targetdir\" value=3D\"${basedir}/bin\"/>\n"
+      "    <property name=3D\"librarydir\" value=3D\"${basedir}/lib\"/>\n"
+      "\n"
+      "    <path id=3D\"libraries\">\n"
+      "        <fileset dir=3D\"${librarydir}\">\n"
+      "            <include name=3D\"*.jar\"/>\n"
+      "        </fileset>\n"
+      "    </path>\n"
+      "\n"
+      "    <target name=3D\"clean\">\n"
+      "        <delete dir=3D\"${targetdir}\"/>\n"
+      "        <mkdir dir=3D\"${targetdir}\"/>\n"
+      "    </target>\n"
+      "\n"
+      "    <target name=3D\"compile\" depends=3D\"clean, copy-resources\">=
\n"
+      "      <javac srcdir=3D\"${sourcedir}\"\n"
+      "             destdir=3D\"${targetdir}\"\n"
+      "             classpathref=3D\"libraries\"/>\n"
+      "    </target>\n"
+      "\n"
+      "    <target name=3D\"copy-resources\">\n"
+      "        <copy todir=3D\"${targetdir}\">\n"
+      "            <fileset dir=3D\"${sourcedir}\">\n"
+      "                <exclude name=3D\"**/*.java\"/>\n"
+      "            </fileset>\n"
+      "        </copy>\n"
+      "    </target>\n"
+      "\n"
+      "</project>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:346
+#, no-c-format
 msgid "This will tell Ant to add all files in the lib directory ending wit=
h <literal>.jar</literal> to the classpath used for compilation. It will al=
so copy all non-Java source files to the target directory, e.g. configurati=
on and Hibernate mapping files. If you now run Ant, you should get this out=
put:"
 msgstr ""
 =

-#: tutorial.xml:501(title) =

+#. Tag: programlisting
+#: tutorial.xml:353
+#, no-c-format
+msgid ""
+      "<![CDATA[C:\\hibernateTutorial\\>ant\n"
+      "Buildfile: build.xml\n"
+      "\n"
+      "copy-resources:\n"
+      "     [copy] Copying 2 files to C:\\hibernateTutorial\\bin\n"
+      "\n"
+      "compile:\n"
+      "    [javac] Compiling 1 source file to C:\\hibernateTutorial\\bin\n"
+      "\n"
+      "BUILD SUCCESSFUL\n"
+      "Total time: 1 second ]]>"
+msgstr ""
+
+#. Tag: title
+#: tutorial.xml:358
+#, no-c-format
 msgid "Startup and helpers"
 msgstr ""
 =

-#: tutorial.xml:503(para) =

+#. Tag: para
+#: tutorial.xml:360
+#, no-c-format
 msgid "It's time to load and store some <literal>Event</literal> objects, =
but first we have to complete the setup with some infrastructure code. We h=
ave to startup Hibernate. This startup includes building a global <literal>=
SessionFactory</literal> object and to store it somewhere for easy access i=
n application code. A <literal>SessionFactory</literal> can open up new <li=
teral>Session</literal>'s. A <literal>Session</literal> represents a single=
-threaded unit of work, the <literal>SessionFactory</literal> is a thread-s=
afe global object, instantiated once."
 msgstr ""
 =

-#: tutorial.xml:513(para) =

+#. Tag: para
+#: tutorial.xml:370
+#, no-c-format
 msgid "We'll create a <literal>HibernateUtil</literal> helper class which =
takes care of startup and makes accessing a <literal>SessionFactory</litera=
l> convenient. Let's have a look at the implementation:"
 msgstr ""
 =

-#: tutorial.xml:545(para) =

+#. Tag: programlisting
+#: tutorial.xml:376
+#, no-c-format
+msgid ""
+      "<![CDATA[package util;\n"
+      "\n"
+      "import org.hibernate.*;\n"
+      "import org.hibernate.cfg.*;\n"
+      "\n"
+      "public class HibernateUtil {\n"
+      "\n"
+      "    private static final SessionFactory sessionFactory;\n"
+      "\n"
+      "    static {\n"
+      "        try {\n"
+      "            // Create the SessionFactory from hibernate.cfg.xml\n"
+      "            sessionFactory =3D new Configuration().configure().buil=
dSessionFactory();\n"
+      "        } catch (Throwable ex) {\n"
+      "            // Make sure you log the exception, as it might be swal=
lowed\n"
+      "            System.err.println(\"Initial SessionFactory creation fa=
iled.\" + ex);\n"
+      "            throw new ExceptionInInitializerError(ex);\n"
+      "        }\n"
+      "    }\n"
+      "\n"
+      "    public static SessionFactory getSessionFactory() {\n"
+      "        return sessionFactory;\n"
+      "    }\n"
+      "\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:378
+#, no-c-format
 msgid "This class does not only produce the global <literal>SessionFactory=
</literal> in its static initializer (called once by the JVM when the class=
 is loaded), but also hides the fact that it uses a static singleton. It mi=
ght as well lookup the <literal>SessionFactory</literal> from JNDI in an ap=
plication server."
 msgstr ""
 =

-#: tutorial.xml:552(para) =

+#. Tag: para
+#: tutorial.xml:385
+#, no-c-format
 msgid "If you give the <literal>SessionFactory</literal> a name in your co=
nfiguration file, Hibernate will in fact try to bind it to JNDI after it ha=
s been built. To avoid this code completely you could also use JMX deployme=
nt and let the JMX-capable container instantiate and bind a <literal>Hibern=
ateService</literal> to JNDI. These advanced options are discussed in the H=
ibernate reference documentation."
 msgstr ""
 =

-#: tutorial.xml:561(para) =

+#. Tag: para
+#: tutorial.xml:394
+#, no-c-format
 msgid "Place <literal>HibernateUtil.java</literal> in the development sour=
ce directory, in a package next to <literal>events</literal>:"
 msgstr ""
 =

-#: tutorial.xml:579(para) =

+#. Tag: programlisting
+#: tutorial.xml:399
+#, no-c-format
+msgid ""
+      "<![CDATA[.\n"
+      "+lib\n"
+      "  <Hibernate and third-party libraries>\n"
+      "+src\n"
+      "  +events\n"
+      "    Event.java\n"
+      "    Event.hbm.xml\n"
+      "  +util\n"
+      "    HibernateUtil.java\n"
+      "  hibernate.cfg.xml\n"
+      "+data\n"
+      "build.xml]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:401
+#, no-c-format
 msgid "This should again compile without problems. We finally need to conf=
igure a logging system - Hibernate uses commons logging and leaves you the =
choice between Log4j and JDK 1.4 logging. Most developers prefer Log4j: cop=
y <literal>log4j.properties</literal> from the Hibernate distribution (it's=
 in the <literal>etc/</literal> directory) to your <literal>src</literal> d=
irectory, next to <literal>hibernate.cfg.xml</literal>. Have a look at the =
example configuration and change the settings if you like to have more verb=
ose output. By default, only Hibernate startup message are shown on stdout."
 msgstr ""
 =

-#: tutorial.xml:589(para) =

+#. Tag: para
+#: tutorial.xml:411
+#, no-c-format
 msgid "The tutorial infrastructure is complete - and we are ready to do so=
me real work with Hibernate."
 msgstr ""
 =

-#: tutorial.xml:597(title) =

+#. Tag: title
+#: tutorial.xml:419
+#, no-c-format
 msgid "Loading and storing objects"
 msgstr ""
 =

-#: tutorial.xml:599(para) =

+#. Tag: para
+#: tutorial.xml:421
+#, no-c-format
 msgid "Finally, we can use Hibernate to load and store objects. We write a=
n <literal>EventManager</literal> class with a <literal>main()</literal> me=
thod:"
 msgstr ""
 =

-#: tutorial.xml:640(para) =

+#. Tag: programlisting
+#: tutorial.xml:426
+#, no-c-format
+msgid ""
+      "<![CDATA[package events;\n"
+      "import org.hibernate.Session;\n"
+      "\n"
+      "import java.util.Date;\n"
+      "\n"
+      "import util.HibernateUtil;\n"
+      "\n"
+      "public class EventManager {\n"
+      "\n"
+      "    public static void main(String[] args) {\n"
+      "        EventManager mgr =3D new EventManager();\n"
+      "\n"
+      "        if (args[0].equals(\"store\")) {\n"
+      "            mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+      "        }\n"
+      "\n"
+      "        HibernateUtil.getSessionFactory().close();\n"
+      "    }\n"
+      "\n"
+      "    private void createAndStoreEvent(String title, Date theDate) {\=
n"
+      "\n"
+      "        Session session =3D HibernateUtil.getSessionFactory().getCu=
rrentSession();\n"
+      "\n"
+      "        session.beginTransaction();\n"
+      "\n"
+      "        Event theEvent =3D new Event();\n"
+      "        theEvent.setTitle(title);\n"
+      "        theEvent.setDate(theDate);\n"
+      "\n"
+      "        session.save(theEvent);\n"
+      "\n"
+      "        session.getTransaction().commit();\n"
+      "    }\n"
+      "\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:428
+#, no-c-format
 msgid "We create a new <literal>Event</literal> object, and hand it over t=
o Hibernate. Hibernate now takes care of the SQL and executes <literal>INSE=
RT</literal>s on the database. Let's have a look at the <literal>Session</l=
iteral> and <literal>Transaction</literal>-handling code before we run this=
."
 msgstr ""
 =

-#: tutorial.xml:647(para) =

+#. Tag: para
+#: tutorial.xml:435
+#, no-c-format
 msgid "A <literal>Session</literal> is a single unit of work. For now we'l=
l keep things simple and assume a one-to-one granularity between a Hibernat=
e <literal>Session</literal> and a database transaction. To shield our code=
 from the actual underlying transaction system (in this case plain JDBC, bu=
t it could also run with JTA) we use the <literal>Transaction</literal> API=
 that is available on the Hibernate <literal>Session</literal>."
 msgstr ""
 =

-#: tutorial.xml:655(para) =

+#. Tag: para
+#: tutorial.xml:443
+#, no-c-format
 msgid "What does <literal>sessionFactory.getCurrentSession()</literal> do?=
 First, you can call it as many times and anywhere you like, once you get h=
old of your <literal>SessionFactory</literal> (easy thanks to <literal>Hibe=
rnateUtil</literal>). The <literal>getCurrentSession()</literal> method alw=
ays returns the \"current\" unit of work. Remember that we switched the con=
figuration option for this mechanism to \"thread\" in <literal>hibernate.cf=
g.xml</literal>? Hence, the current unit of work is bound to the current Ja=
va thread that executes our application. However, this is not the full pict=
ure, you also have to consider scope, when a unit of work begins and when i=
t ends."
 msgstr ""
 =

-#: tutorial.xml:666(para) =

+#. Tag: para
+#: tutorial.xml:454
+#, no-c-format
 msgid "A <literal>Session</literal> begins when it is first needed, when t=
he first call to <literal>getCurrentSession()</literal> is made. It is then=
 bound by Hibernate to the current thread. When the transaction ends, eithe=
r through commit or rollback, Hibernate automatically unbinds the <literal>=
Session</literal> from the thread and closes it for you. If you call <liter=
al>getCurrentSession()</literal> again, you get a new <literal>Session</lit=
eral> and can start a new unit of work. This <emphasis>thread-bound</emphas=
is> programming model is the most popular way of using Hibernate, as it all=
ows flexible layering of your code (transaction demarcation code can be sep=
arated from data access code, we'll do this later in this tutorial)."
 msgstr ""
 =

-#: tutorial.xml:677(para) =

+#. Tag: para
+#: tutorial.xml:465
+#, no-c-format
 msgid "Related to the unit of work scope, should the Hibernate <literal>Se=
ssion</literal> be used to execute one or several database operations? The =
above example uses one <literal>Session</literal> for one operation. This i=
s pure coincidence, the example is just not complex enough to show any othe=
r approach. The scope of a Hibernate <literal>Session</literal> is flexible=
 but you should never design your application to use a new Hibernate <liter=
al>Session</literal> for <emphasis>every</emphasis> database operation. So =
even if you see it a few more times in the following (very trivial) example=
s, consider <emphasis>session-per-operation</emphasis> an anti-pattern. A r=
eal (web) application is shown later in this tutorial."
 msgstr ""
 =

-#: tutorial.xml:688(para) =

+#. Tag: para
+#: tutorial.xml:476
+#, no-c-format
 msgid "Have a look at <xref linkend=3D\"transactions\"/> for more informat=
ion about transaction handling and demarcation. We also skipped any error h=
andling and rollback in the previous example."
 msgstr ""
 =

-#: tutorial.xml:694(para) =

+#. Tag: para
+#: tutorial.xml:482
+#, no-c-format
 msgid "To run this first routine we have to add a callable target to the A=
nt build file:"
 msgstr ""
 =

-#: tutorial.xml:705(para) =

+#. Tag: programlisting
+#: tutorial.xml:486
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"run\" depends=3D\"compile\">\n"
+      "    <java fork=3D\"true\" classname=3D\"events.EventManager\" class=
pathref=3D\"libraries\">\n"
+      "        <classpath path=3D\"${targetdir}\"/>\n"
+      "        <arg value=3D\"${action}\"/>\n"
+      "    </java>\n"
+      "</target>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:488
+#, no-c-format
 msgid "The value of the <literal>action</literal> argument is set on the c=
ommand line when calling the target:"
 msgstr ""
 =

-#: tutorial.xml:712(para) =

+#. Tag: programlisting
+#: tutorial.xml:493
+#, no-c-format
+msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=3Dstore]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:495
+#, no-c-format
 msgid "You should see, after compilation, Hibernate starting up and, depen=
ding on your configuration, lots of log output. At the end you will find th=
e following line:"
 msgstr ""
 =

-#: tutorial.xml:719(para) =

+#. Tag: programlisting
+#: tutorial.xml:500
+#, no-c-format
+msgid "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, E=
VENT_ID) values (?, ?, ?)]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:502
+#, no-c-format
 msgid "This is the <literal>INSERT</literal> executed by Hibernate, the qu=
estion marks represent JDBC bind parameters. To see the values bound as arg=
uments, or to reduce the verbosity of the log, check your <literal>log4j.pr=
operties</literal>."
 msgstr ""
 =

-#: tutorial.xml:725(para) =

+#. Tag: para
+#: tutorial.xml:508
+#, no-c-format
 msgid "Now we'd like to list stored events as well, so we add an option to=
 the main method:"
 msgstr ""
 =

-#: tutorial.xml:741(para) =

+#. Tag: programlisting
+#: tutorial.xml:512
+#, no-c-format
+msgid ""
+      "<![CDATA[if (args[0].equals(\"store\")) {\n"
+      "    mgr.createAndStoreEvent(\"My Event\", new Date());\n"
+      "}\n"
+      "else if (args[0].equals(\"list\")) {\n"
+      "    List events =3D mgr.listEvents();\n"
+      "    for (int i =3D 0; i < events.size(); i++) {\n"
+      "        Event theEvent =3D (Event) events.get(i);\n"
+      "        System.out.println(\"Event: \" + theEvent.getTitle() +\n"
+      "                           \" Time: \" + theEvent.getDate());\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:514
+#, no-c-format
 msgid "We also add a new <literal>listEvents() method</literal>:"
 msgstr ""
 =

-#: tutorial.xml:758(para) =

+#. Tag: programlisting
+#: tutorial.xml:518
+#, no-c-format
+msgid ""
+      "<![CDATA[private List listEvents() {\n"
+      "\n"
+      "    Session session =3D HibernateUtil.getSessionFactory().getCurren=
tSession();\n"
+      "\n"
+      "    session.beginTransaction();\n"
+      "\n"
+      "    List result =3D session.createQuery(\"from Event\").list();\n"
+      "\n"
+      "    session.getTransaction().commit();\n"
+      "\n"
+      "    return result;\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:520
+#, no-c-format
 msgid "What we do here is use an HQL (Hibernate Query Language) query to l=
oad all existing <literal>Event</literal> objects from the database. Hibern=
ate will generate the appropriate SQL, send it to the database and populate=
 <literal>Event</literal> objects with the data. You can create more comple=
x queries with HQL, of course."
 msgstr ""
 =

-#: tutorial.xml:765(para) =

+#. Tag: para
+#: tutorial.xml:527
+#, no-c-format
 msgid "Now, to execute and test all of this, follow these steps:"
 msgstr ""
 =

-#: tutorial.xml:771(para) =

+#. Tag: para
+#: tutorial.xml:533
+#, no-c-format
 msgid "Run <literal>ant run -Daction=3Dstore</literal> to store something =
into the database and, of course, to generate the database schema before th=
rough hbm2ddl."
 msgstr ""
 =

-#: tutorial.xml:777(para) =

-msgid "Now disable hbm2ddl by commenting out the property in your <literal=
>hibernate.cfg.xml</literal> file. Usually you only leave it turned on in c=
ontinous unit testing, but another run of hbm2ddl would <emphasis>drop</emp=
hasis> everything you have stored - the <literal>create</literal> configura=
tion setting actually translates into \"drop all tables from the schema, th=
en re-create all tables, when the SessionFactory is build\"."
+#. Tag: para
+#: tutorial.xml:539
+#, no-c-format
+msgid "Now disable hbm2ddl by commenting out the property in your <literal=
>hibernate.cfg.xml</literal> file. Usually you only leave it turned on in c=
ontinuous unit testing, but another run of hbm2ddl would <emphasis>drop</em=
phasis> everything you have stored - the <literal>create</literal> configur=
ation setting actually translates into \"drop all tables from the schema, t=
hen re-create all tables, when the SessionFactory is build\"."
 msgstr ""
 =

-#: tutorial.xml:787(para) =

+#. Tag: para
+#: tutorial.xml:549
+#, no-c-format
 msgid "If you now call Ant with <literal>-Daction=3Dlist</literal>, you sh=
ould see the events you have stored so far. You can of course also call the=
 <literal>store</literal> action a few times more."
 msgstr ""
 =

-#: tutorial.xml:793(para) =

+#. Tag: para
+#: tutorial.xml:555
+#, no-c-format
 msgid "Note: Most new Hibernate users fail at this point and we see questi=
ons about <emphasis>Table not found</emphasis> error messages regularly. Ho=
wever, if you follow the steps outlined above you will not have this proble=
m, as hbm2ddl creates the database schema on the first run, and subsequent =
application restarts will use this schema. If you change the mapping and/or=
 database schema, you have to re-enable hbm2ddl once again."
 msgstr ""
 =

-#: tutorial.xml:806(title) =

+#. Tag: title
+#: tutorial.xml:568
+#, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr ""
 =

-#: tutorial.xml:808(para) =

+#. Tag: para
+#: tutorial.xml:570
+#, no-c-format
 msgid "We mapped a persistent entity class to a table. Let's build on this=
 and add some class associations. First we'll add people to our application=
, and store a list of events they participate in."
 msgstr ""
 =

-#: tutorial.xml:814(title) =

+#. Tag: title
+#: tutorial.xml:576
+#, no-c-format
 msgid "Mapping the Person class"
 msgstr ""
 =

-#: tutorial.xml:816(para) =

+#. Tag: para
+#: tutorial.xml:578
+#, no-c-format
 msgid "The first cut of the <literal>Person</literal> class is simple:"
 msgstr ""
 =

-#: tutorial.xml:835(para) =

+#. Tag: programlisting
+#: tutorial.xml:582
+#, no-c-format
+msgid ""
+      "<![CDATA[package events;\n"
+      "\n"
+      "public class Person {\n"
+      "\n"
+      "    private Long id;\n"
+      "    private int age;\n"
+      "    private String firstname;\n"
+      "    private String lastname;\n"
+      "\n"
+      "    public Person() {}\n"
+      "\n"
+      "    // Accessor methods for all properties, private setter for 'id'=
\n"
+      "\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:584
+#, no-c-format
 msgid "Create a new mapping file called <literal>Person.hbm.xml</literal> =
(don't forget the DTD reference at the top):"
 msgstr ""
 =

-#: tutorial.xml:853(para) =

+#. Tag: programlisting
+#: tutorial.xml:589
+#, no-c-format
+msgid ""
+      "<![CDATA[<hibernate-mapping>\n"
+      "\n"
+      "    <class name=3D\"events.Person\" table=3D\"PERSON\">\n"
+      "        <id name=3D\"id\" column=3D\"PERSON_ID\">\n"
+      "            <generator class=3D\"native\"/>\n"
+      "        </id>\n"
+      "        <property name=3D\"age\"/>\n"
+      "        <property name=3D\"firstname\"/>\n"
+      "        <property name=3D\"lastname\"/>\n"
+      "    </class>\n"
+      "\n"
+      "</hibernate-mapping>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:591
+#, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr ""
 =

-#: tutorial.xml:860(para) =

+#. Tag: programlisting
+#: tutorial.xml:595
+#, no-c-format
+msgid ""
+      "<![CDATA[<mapping resource=3D\"events/Event.hbm.xml\"/>\n"
+      "<mapping resource=3D\"events/Person.hbm.xml\"/>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:597
+#, no-c-format
 msgid "We'll now create an association between these two entities. Obvious=
ly, persons can participate in events, and events have participants. The de=
sign questions we have to deal with are: directionality, multiplicity, and =
collection behavior."
 msgstr ""
 =

-#: tutorial.xml:870(title) =

+#. Tag: title
+#: tutorial.xml:607
+#, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr ""
 =

-#: tutorial.xml:872(para) =

+#. Tag: para
+#: tutorial.xml:609
+#, no-c-format
 msgid "We'll add a collection of events to the <literal>Person</literal> c=
lass. That way we can easily navigate to the events for a particular person=
, without executing an explicit query - by calling <literal>aPerson.getEven=
ts()</literal>. We use a Java collection, a <literal>Set</literal>, because=
 the collection will not contain duplicate elements and the ordering is not=
 relevant for us."
 msgstr ""
 =

-#: tutorial.xml:879(para) =

+#. Tag: para
+#: tutorial.xml:616
+#, no-c-format
 msgid "We need a unidirectional, many-valued associations, implemented wit=
h a <literal>Set</literal>. Let's write the code for this in the Java class=
es and then map it:"
 msgstr ""
 =

-#: tutorial.xml:897(para) =

+#. Tag: programlisting
+#: tutorial.xml:621
+#, no-c-format
+msgid ""
+      "<![CDATA[public class Person {\n"
+      "\n"
+      "    private Set events =3D new HashSet();\n"
+      "\n"
+      "    public Set getEvents() {\n"
+      "        return events;\n"
+      "    }\n"
+      "\n"
+      "    public void setEvents(Set events) {\n"
+      "        this.events =3D events;\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:623
+#, no-c-format
 msgid "Before we map this association, think about the other side. Clearly=
, we could just keep this unidirectional. Or, we could create another colle=
ction on the <literal>Event</literal>, if we want to be able to navigate it=
 bi-directional, i.e. <literal>anEvent.getParticipants()</literal>. This is=
 not necessary, from a functional perspective. You could always execute an =
explicit query to retrieve the participants for a particular event. This is=
 a design choice left to you, but what is clear from this discussion is the=
 multiplicity of the association: \"many\" valued on both sides, we call th=
is a <emphasis>many-to-many</emphasis> association. Hence, we use Hibernate=
's many-to-many mapping:"
 msgstr ""
 =

-#: tutorial.xml:923(para) =

+#. Tag: programlisting
+#: tutorial.xml:634
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"events.Person\" table=3D\"PERSON\">\n"
+      "    <id name=3D\"id\" column=3D\"PERSON_ID\">\n"
+      "        <generator class=3D\"native\"/>\n"
+      "    </id>\n"
+      "    <property name=3D\"age\"/>\n"
+      "    <property name=3D\"firstname\"/>\n"
+      "    <property name=3D\"lastname\"/>\n"
+      "\n"
+      "    <set name=3D\"events\" table=3D\"PERSON_EVENT\">\n"
+      "        <key column=3D\"PERSON_ID\"/>\n"
+      "        <many-to-many column=3D\"EVENT_ID\" class=3D\"events.Event\=
"/>\n"
+      "    </set>\n"
+      "\n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:636
+#, no-c-format
 msgid "Hibernate supports all kinds of collection mappings, a <literal>&lt=
;set&gt;</literal> being most common. For a many-to-many association (or <e=
mphasis>n:m</emphasis> entity relationship), an association table is needed=
. Each row in this table represents a link between a person and an event. T=
he table name is configured with the <literal>table</literal> attribute of =
the <literal>set</literal> element. The identifier column name in the assoc=
iation, for the person's side, is defined with the <literal>&lt;key&gt;</li=
teral> element, the column name for the event's side with the <literal>colu=
mn</literal> attribute of the <literal>&lt;many-to-many&gt;</literal>. You =
also have to tell Hibernate the class of the objects in your collection (co=
rrect: the class on the other side of the collection of references)."
 msgstr ""
 =

-#: tutorial.xml:935(para) =

+#. Tag: para
+#: tutorial.xml:648
+#, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr ""
 =

-#: tutorial.xml:956(title) =

+#. Tag: programlisting
+#: tutorial.xml:652
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "    _____________        __________________\n"
+      "   |             |      |                  |       _____________\n"
+      "   |   EVENTS    |      |   PERSON_EVENT   |      |             |\n"
+      "   |_____________|      |__________________|      |    PERSON   |\n"
+      "   |             |      |                  |      |_____________|\n"
+      "   | *EVENT_ID   | <--> | *EVENT_ID        |      |             |\n"
+      "   |  EVENT_DATE |      | *PERSON_ID       | <--> | *PERSON_ID  |\n"
+      "   |  TITLE      |      |__________________|      |  AGE        |\n"
+      "   |_____________|                                |  FIRSTNAME  |\n"
+      "                                                  |  LASTNAME   |\n"
+      "                                                  |_____________|\n"
+      " ]]>"
+msgstr ""
+
+#. Tag: title
+#: tutorial.xml:657
+#, no-c-format
 msgid "Working the association"
 msgstr ""
 =

-#: tutorial.xml:958(para) =

+#. Tag: para
+#: tutorial.xml:659
+#, no-c-format
 msgid "Let's bring some people and events together in a new method in <lit=
eral>EventManager</literal>:"
 msgstr ""
 =

-#: tutorial.xml:975(para) =

+#. Tag: programlisting
+#: tutorial.xml:663
+#, no-c-format
+msgid ""
+      "<![CDATA[private void addPersonToEvent(Long personId, Long eventId)=
 {\n"
+      "\n"
+      "    Session session =3D HibernateUtil.getSessionFactory().getCurren=
tSession();\n"
+      "    session.beginTransaction();\n"
+      "\n"
+      "    Person aPerson =3D (Person) session.load(Person.class, personId=
);\n"
+      "    Event anEvent =3D (Event) session.load(Event.class, eventId);\n"
+      "\n"
+      "    aPerson.getEvents().add(anEvent);\n"
+      "\n"
+      "    session.getTransaction().commit();\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:665
+#, no-c-format
 msgid "After loading a <literal>Person</literal> and an <literal>Event</li=
teral>, simply modify the collection using the normal collection methods. A=
s you can see, there is no explicit call to <literal>update()</literal> or =
<literal>save()</literal>, Hibernate automatically detects that the collect=
ion has been modified and needs to be updated. This is called <emphasis>aut=
omatic dirty checking</emphasis>, and you can also try it by modifying the =
name or the date property of any of your objects. As long as they are in <e=
mphasis>persistent</emphasis> state, that is, bound to a particular Hiberna=
te <literal>Session</literal> (i.e. they have been just loaded or saved in =
a unit of work), Hibernate monitors any changes and executes SQL in a write=
-behind fashion. The process of synchronizing the memory state with the dat=
abase, usually only at the end of a unit of work, is called <emphasis>flush=
ing</emphasis>. In our code, the unit of work ends with a commit (or rollba=
ck) of the dat!
 abase transaction - as defined by the <literal>thread</literal> configurat=
ion option for the <literal>CurrentSessionContext</literal> class."
 msgstr ""
 =

-#: tutorial.xml:990(para) =

+#. Tag: para
+#: tutorial.xml:680
+#, no-c-format
 msgid "You might of course load person and event in different units of wor=
k. Or you modify an object outside of a <literal>Session</literal>, when it=
 is not in persistent state (if it was persistent before, we call this stat=
e <emphasis>detached</emphasis>). You can even modify a collection when it =
is detached:"
 msgstr ""
 =

-#: tutorial.xml:1025(para) =

+#. Tag: programlisting
+#: tutorial.xml:687
+#, no-c-format
+msgid ""
+      "<![CDATA[private void addPersonToEvent(Long personId, Long eventId)=
 {\n"
+      "\n"
+      "    Session session =3D HibernateUtil.getSessionFactory().getCurren=
tSession();\n"
+      "    session.beginTransaction();\n"
+      "\n"
+      "    Person aPerson =3D (Person) session\n"
+      "            .createQuery(\"select p from Person p left join fetch p=
.events where p.id =3D :pid\")\n"
+      "            .setParameter(\"pid\", personId)\n"
+      "            .uniqueResult(); // Eager fetch the collection so we ca=
n use it detached\n"
+      "\n"
+      "    Event anEvent =3D (Event) session.load(Event.class, eventId);\n"
+      "\n"
+      "    session.getTransaction().commit();\n"
+      "\n"
+      "    // End of first unit of work\n"
+      "\n"
+      "    aPerson.getEvents().add(anEvent); // aPerson (and its collectio=
n) is detached\n"
+      "\n"
+      "    // Begin second unit of work\n"
+      "\n"
+      "    Session session2 =3D HibernateUtil.getSessionFactory().getCurre=
ntSession();\n"
+      "    session2.beginTransaction();\n"
+      "\n"
+      "    session2.update(aPerson); // Reattachment of aPerson\n"
+      "\n"
+      "    session2.getTransaction().commit();\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:689
+#, no-c-format
 msgid "The call to <literal>update</literal> makes a detached object persi=
stent again, you could say it binds it to a new unit of work, so any modifi=
cations you made to it while detached can be saved to the database. This in=
cludes any modifications (additions/deletions) you made to a collection of =
that entity object."
 msgstr ""
 =

-#: tutorial.xml:1032(para) =

+#. Tag: para
+#: tutorial.xml:696
+#, no-c-format
 msgid "Well, this is not much use in our current situation, but it's an im=
portant concept you can design into your own application. For now, complete=
 this exercise by adding a new action to the <literal>EventManager</literal=
>'s main method and call it from the command line. If you need the identifi=
ers of a person and an event - the <literal>save()</literal> method returns=
 it (you might have to modify some of the previous methods to return that i=
dentifier):"
 msgstr ""
 =

-#: tutorial.xml:1047(para) =

+#. Tag: programlisting
+#: tutorial.xml:704
+#, no-c-format
+msgid ""
+      "<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
+      "    Long eventId =3D mgr.createAndStoreEvent(\"My Event\", new Date=
());\n"
+      "    Long personId =3D mgr.createAndStorePerson(\"Foo\", \"Bar\");\n"
+      "    mgr.addPersonToEvent(personId, eventId);\n"
+      "    System.out.println(\"Added person \" + personId + \" to event \=
" + eventId);\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:706
+#, no-c-format
 msgid "This was an example of an association between two equally important=
 classes, two entities. As mentioned earlier, there are other classes and t=
ypes in a typical model, usually \"less important\". Some you have already =
seen, like an <literal>int</literal> or a <literal>String</literal>. We cal=
l these classes <emphasis>value types</emphasis>, and their instances <emph=
asis>depend</emphasis> on a particular entity. Instances of these types don=
't have their own identity, nor are they shared between entities (two perso=
ns don't reference the same <literal>firstname</literal> object, even if th=
ey have the same first name). Of course, value types can not only be found =
in the JDK (in fact, in a Hibernate application all JDK classes are conside=
red value types), but you can also write dependent classes yourself, <liter=
al>Address</literal> or <literal>MonetaryAmount</literal>, for example."
 msgstr ""
 =

-#: tutorial.xml:1060(para) =

+#. Tag: para
+#: tutorial.xml:719
+#, no-c-format
 msgid "You can also design a collection of value types. This is conceptual=
ly very different from a collection of references to other entities, but lo=
oks almost the same in Java."
 msgstr ""
 =

-#: tutorial.xml:1068(title) =

+#. Tag: title
+#: tutorial.xml:727
+#, no-c-format
 msgid "Collection of values"
 msgstr ""
 =

-#: tutorial.xml:1070(para) =

+#. Tag: para
+#: tutorial.xml:729
+#, no-c-format
 msgid "We add a collection of value typed objects to the <literal>Person</=
literal> entity. We want to store email addresses, so the type we use is <l=
iteral>String</literal>, and the collection is again a <literal>Set</litera=
l>:"
 msgstr ""
 =

-#: tutorial.xml:1085(para) =

+#. Tag: programlisting
+#: tutorial.xml:734
+#, no-c-format
+msgid ""
+      "<![CDATA[private Set emailAddresses =3D new HashSet();\n"
+      "\n"
+      "public Set getEmailAddresses() {\n"
+      "    return emailAddresses;\n"
+      "}\n"
+      "\n"
+      "public void setEmailAddresses(Set emailAddresses) {\n"
+      "    this.emailAddresses =3D emailAddresses;\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:736
+#, no-c-format
 msgid "The mapping of this <literal>Set</literal>:"
 msgstr ""
 =

-#: tutorial.xml:1094(para) =

+#. Tag: programlisting
+#: tutorial.xml:740
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"emailAddresses\" table=3D\"PERSON_EMAIL_ADDR=
\">\n"
+      "    <key column=3D\"PERSON_ID\"/>\n"
+      "    <element type=3D\"string\" column=3D\"EMAIL_ADDR\"/>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:742
+#, no-c-format
 msgid "The difference compared with the earlier mapping is the <literal>el=
ement</literal> part, which tells Hibernate that the collection does not co=
ntain references to another entity, but a collection of elements of type <l=
iteral>String</literal> (the lowercase name tells you it's a Hibernate mapp=
ing type/converter). Once again, the <literal>table</literal> attribute of =
the <literal>set</literal> element determines the table name for the collec=
tion. The <literal>key</literal> element defines the foreign-key column nam=
e in the collection table. The <literal>column</literal> attribute in the <=
literal>element</literal> element defines the column name where the <litera=
l>String</literal> values will actually be stored."
 msgstr ""
 =

-#: tutorial.xml:1104(para) =

+#. Tag: para
+#: tutorial.xml:752
+#, no-c-format
 msgid "Have a look at the updated schema:"
 msgstr ""
 =

-#: tutorial.xml:1122(para) =

+#. Tag: programlisting
+#: tutorial.xml:756
+#, no-c-format
+msgid ""
+      "<![CDATA[\n"
+      "  _____________        __________________\n"
+      " |             |      |                  |       _____________\n"
+      " |   EVENTS    |      |   PERSON_EVENT   |      |             |    =
   ___________________\n"
+      " |_____________|      |__________________|      |    PERSON   |    =
  |                   |\n"
+      " |             |      |                  |      |_____________|    =
  | PERSON_EMAIL_ADDR |\n"
+      " | *EVENT_ID   | <--> | *EVENT_ID        |      |             |    =
  |___________________|\n"
+      " |  EVENT_DATE |      | *PERSON_ID       | <--> | *PERSON_ID  | <--=
> |  *PERSON_ID       |\n"
+      " |  TITLE      |      |__________________|      |  AGE        |    =
  |  *EMAIL_ADDR      |\n"
+      " |_____________|                                |  FIRSTNAME  |    =
  |___________________|\n"
+      "                                                |  LASTNAME   |\n"
+      "                                                |_____________|\n"
+      " ]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:758
+#, no-c-format
 msgid "You can see that the primary key of the collection table is in fact=
 a composite key, using both columns. This also implies that there can't be=
 duplicate email addresses per person, which is exactly the semantics we ne=
ed for a set in Java."
 msgstr ""
 =

-#: tutorial.xml:1128(para) =

+#. Tag: para
+#: tutorial.xml:764
+#, no-c-format
 msgid "You can now try and add elements to this collection, just like we d=
id before by linking persons and events. It's the same code in Java:"
 msgstr ""
 =

-#: tutorial.xml:1146(para) =

-msgid "This time we didnt' use a <emphasis>fetch</emphasis> query to initi=
alize the collection. Hence, the call to its getter method will trigger an =
additional select to initialize it, so we can add an element to it. Monitor=
 the SQL log and try to optimize this with an eager fetch."
+#. Tag: programlisting
+#: tutorial.xml:769
+#, no-c-format
+msgid ""
+      "<![CDATA[private void addEmailToPerson(Long personId, String emailA=
ddress) {\n"
+      "\n"
+      "    Session session =3D HibernateUtil.getSessionFactory().getCurren=
tSession();\n"
+      "    session.beginTransaction();\n"
+      "\n"
+      "    Person aPerson =3D (Person) session.load(Person.class, personId=
);\n"
+      "\n"
+      "    // The getEmailAddresses() might trigger a lazy load of the col=
lection\n"
+      "    aPerson.getEmailAddresses().add(emailAddress);\n"
+      "\n"
+      "    session.getTransaction().commit();\n"
+      "}]]>"
 msgstr ""
 =

-#: tutorial.xml:1156(title) =

+#. Tag: para
+#: tutorial.xml:771
+#, no-c-format
+msgid "This time we didn't use a <emphasis>fetch</emphasis> query to initi=
alize the collection. Hence, the call to its getter method will trigger an =
additional select to initialize it, so we can add an element to it. Monitor=
 the SQL log and try to optimize this with an eager fetch."
+msgstr ""
+
+#. Tag: title
+#: tutorial.xml:781
+#, no-c-format
 msgid "Bi-directional associations"
 msgstr ""
 =

-#: tutorial.xml:1158(para) =

+#. Tag: para
+#: tutorial.xml:783
+#, no-c-format
 msgid "Next we are going to map a bi-directional association - making the =
association between person and event work from both sides in Java. Of cours=
e, the database schema doesn't change, we still have many-to-many multiplic=
ity. A relational database is more flexible than a network programming lang=
uage, so it doesn't need anything like a navigation direction - data can be=
 viewed and retrieved in any possible way."
 msgstr ""
 =

-#: tutorial.xml:1166(para) =

+#. Tag: para
+#: tutorial.xml:791
+#, no-c-format
 msgid "First, add a collection of participants to the <literal>Event</lite=
ral> Event class:"
 msgstr ""
 =

-#: tutorial.xml:1180(para) =

+#. Tag: programlisting
+#: tutorial.xml:795
+#, no-c-format
+msgid ""
+      "<![CDATA[private Set participants =3D new HashSet();\n"
+      "\n"
+      "public Set getParticipants() {\n"
+      "    return participants;\n"
+      "}\n"
+      "\n"
+      "public void setParticipants(Set participants) {\n"
+      "    this.participants =3D participants;\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:797
+#, no-c-format
 msgid "Now map this side of the association too, in <literal>Event.hbm.xml=
</literal>."
 msgstr ""
 =

-#: tutorial.xml:1189(para) =

+#. Tag: programlisting
+#: tutorial.xml:801
+#, no-c-format
+msgid ""
+      "<![CDATA[<set name=3D\"participants\" table=3D\"PERSON_EVENT\" inve=
rse=3D\"true\">\n"
+      "    <key column=3D\"EVENT_ID\"/>\n"
+      "    <many-to-many column=3D\"PERSON_ID\" class=3D\"events.Person\"/=
>\n"
+      "</set>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:803
+#, no-c-format
 msgid "As you see, these are normal <literal>set</literal> mappings in bot=
h mapping documents. Notice that the column names in <literal>key</literal>=
 and <literal>many-to-many</literal> are swapped in both mapping documents.=
 The most important addition here is the <literal>inverse=3D\"true\"</liter=
al> attribute in the <literal>set</literal> element of the <literal>Event</=
literal>'s collection mapping."
 msgstr ""
 =

-#: tutorial.xml:1197(para) =

+#. Tag: para
+#: tutorial.xml:811
+#, no-c-format
 msgid "What this means is that Hibernate should take the other side - the =
<literal>Person</literal> class - when it needs to find out information abo=
ut the link between the two. This will be a lot easier to understand once y=
ou see how the bi-directional link between our two entities is created ."
 msgstr ""
 =

-#: tutorial.xml:1206(title) =

+#. Tag: title
+#: tutorial.xml:820
+#, no-c-format
 msgid "Working bi-directional links"
 msgstr ""
 =

-#: tutorial.xml:1208(para) =

+#. Tag: para
+#: tutorial.xml:822
+#, no-c-format
 msgid "First, keep in mind that Hibernate does not affect normal Java sema=
ntics. How did we create a link between a <literal>Person</literal> and an =
<literal>Event</literal> in the unidirectional example? We added an instanc=
e of <literal>Event</literal> to the collection of event references, of an =
instance of <literal>Person</literal>. So, obviously, if we want to make th=
is link working bi-directional, we have to do the same on the other side - =
adding a <literal>Person</literal> reference to the collection in an <liter=
al>Event</literal>. This \"setting the link on both sides\" is absolutely n=
ecessary and you should never forget doing it."
 msgstr ""
 =

-#: tutorial.xml:1218(para) =

-msgid "Many developers program defensive and create link management method=
s to correctly set both sides, e.g. in <literal>Person</literal>:"
+#. Tag: para
+#: tutorial.xml:832
+#, no-c-format
+msgid "Many developers program defensively and create link management meth=
ods to correctly set both sides, e.g. in <literal>Person</literal>:"
 msgstr ""
 =

-#: tutorial.xml:1241(para) =

+#. Tag: programlisting
+#: tutorial.xml:837
+#, no-c-format
+msgid ""
+      "<![CDATA[protected Set getEvents() {\n"
+      "    return events;\n"
+      "}\n"
+      "\n"
+      "protected void setEvents(Set events) {\n"
+      "    this.events =3D events;\n"
+      "}\n"
+      "\n"
+      "public void addToEvent(Event event) {\n"
+      "    this.getEvents().add(event);\n"
+      "    event.getParticipants().add(this);\n"
+      "}\n"
+      "\n"
+      "public void removeFromEvent(Event event) {\n"
+      "    this.getEvents().remove(event);\n"
+      "    event.getParticipants().remove(this);\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:839
+#, no-c-format
 msgid "Notice that the get and set methods for the collection are now prot=
ected - this allows classes in the same package and subclasses to still acc=
ess the methods, but prevents everybody else from messing with the collecti=
ons directly (well, almost). You should probably do the same with the colle=
ction on the other side."
 msgstr ""
 =

-#: tutorial.xml:1248(para) =

+#. Tag: para
+#: tutorial.xml:846
+#, no-c-format
 msgid "What about the <literal>inverse</literal> mapping attribute? For yo=
u, and for Java, a bi-directional link is simply a matter of setting the re=
ferences on both sides correctly. Hibernate however doesn't have enough inf=
ormation to correctly arrange SQL <literal>INSERT</literal> and <literal>UP=
DATE</literal> statements (to avoid constraint violations), and needs some =
help to handle bi-directional associations properly. Making one side of the=
 association <literal>inverse</literal> tells Hibernate to basically ignore=
 it, to consider it a <emphasis>mirror</emphasis> of the other side. That's=
 all that is necessary for Hibernate to work out all of the issues when tra=
nsformation a directional navigation model to a SQL database schema. The ru=
les you have to remember are straightforward: All bi-directional associatio=
ns need one side as <literal>inverse</literal>. In a one-to-many associatio=
n it has to be the many-side, in many-to-many association you can pick eith=
er side, there!
  is no difference."
 msgstr ""
 =

-#: tutorial.xml:1263(para) =

-msgid "Let's turn this into a small web application."
+#. Tag: title
+#: tutorial.xml:864
+#, no-c-format
+msgid "Part 3 - The EventManager web application"
 msgstr ""
 =

-#: tutorial.xml:1270(title) =

-msgid "Part 3 - The EventManager web application"
+#. Tag: para
+#: tutorial.xml:866
+#, no-c-format
+msgid "Let's turn the following discussion into a small web application..."
 msgstr ""
 =

-#: tutorial.xml:1272(para) =

+#. Tag: para
+#: tutorial.xml:870
+#, no-c-format
 msgid "A Hibernate web application uses <literal>Session</literal> and <li=
teral>Transaction</literal> almost like a standalone application. However, =
some common patterns are useful. We now write an <literal>EventManagerServl=
et</literal>. This servlet can list all events stored in the database, and =
it provides an HTML form to enter new events."
 msgstr ""
 =

-#: tutorial.xml:1280(title) =

+#. Tag: title
+#: tutorial.xml:878
+#, no-c-format
 msgid "Writing the basic servlet"
 msgstr ""
 =

-#: tutorial.xml:1282(para) =

+#. Tag: para
+#: tutorial.xml:880
+#, no-c-format
 msgid "Create a new class in your source directory, in the <literal>events=
</literal> package:"
 msgstr ""
 =

-#: tutorial.xml:1296(para) =

+#. Tag: programlisting
+#: tutorial.xml:885
+#, no-c-format
+msgid ""
+      "<![CDATA[package events;\n"
+      "\n"
+      "// Imports\n"
+      "\n"
+      "public class EventManagerServlet extends HttpServlet {\n"
+      "\n"
+      "    // Servlet code\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:887
+#, no-c-format
 msgid "The servlet handles HTTP <literal>GET</literal> requests only, henc=
e, the method we implement is <literal>doGet()</literal>:"
 msgstr ""
 =

-#: tutorial.xml:1326(para) =

-msgid "The pattern we are applying here is called <emphasis>session-per-re=
quest</emphasis>. When a request hits the servlet, a new Hibernate <literal=
>Session</literal> is opened through the first call to <literal>getCurrentS=
ession()</literal> on the <literal>SessionFactory</literal>. Then a databas=
e transaction is started-all data access as to occur inside a transaction, =
no matter if data is read or written (we don't use the auto-commit mode in =
applications)."
+#. Tag: programlisting
+#: tutorial.xml:892
+#, no-c-format
+msgid ""
+      "<![CDATA[protected void doGet(HttpServletRequest request,\n"
+      "                     HttpServletResponse response)\n"
+      "        throws ServletException, IOException {\n"
+      "\n"
+      "    SimpleDateFormat dateFormatter =3D new SimpleDateFormat(\"dd.MM=
.yyyy\");\n"
+      "\n"
+      "    try {\n"
+      "        // Begin unit of work\n"
+      "        HibernateUtil.getSessionFactory()\n"
+      "                .getCurrentSession().beginTransaction();\n"
+      "\n"
+      "        // Process request and render page...\n"
+      "\n"
+      "        // End unit of work\n"
+      "        HibernateUtil.getSessionFactory()\n"
+      "                .getCurrentSession().getTransaction().commit();\n"
+      "\n"
+      "    } catch (Exception ex) {\n"
+      "        HibernateUtil.getSessionFactory()\n"
+      "                .getCurrentSession().getTransaction().rollback();\n"
+      "        throw new ServletException(ex);\n"
+      "    }\n"
+      "\n"
+      "}]]>"
 msgstr ""
 =

-#: tutorial.xml:1335(para) =

+#. Tag: para
+#: tutorial.xml:894
+#, no-c-format
+msgid "The pattern we are applying here is called <emphasis>session-per-re=
quest</emphasis>. When a request hits the servlet, a new Hibernate <literal=
>Session</literal> is opened through the first call to <literal>getCurrentS=
ession()</literal> on the <literal>SessionFactory</literal>. Then a databas=
e transaction is started&mdash;all data access as to occur inside a transac=
tion, no matter if data is read or written (we don't use the auto-commit mo=
de in applications)."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:903
+#, no-c-format
 msgid "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</l=
iteral> for every database operation. Use one Hibernate <literal>Session</l=
iteral> that is scoped to the whole request. Use <literal>getCurrentSession=
()</literal>, so that it is automatically bound to the current Java thread."
 msgstr ""
 =

-#: tutorial.xml:1342(para) =

+#. Tag: para
+#: tutorial.xml:910
+#, no-c-format
 msgid "Next, the possible actions of the request are processed and the res=
ponse HTML is rendered. We'll get to that part soon."
 msgstr ""
 =

-#: tutorial.xml:1347(para) =

-msgid "Finally, the unit of work ends when processing and rendering is com=
plete. If any problem occured during processing or rendering, an exception =
will be thrown and the database transaction rolled back. This completes the=
 <literal>session-per-request</literal> pattern. Instead of the transaction=
 demarcation code in every servlet you could also write a servlet filter. S=
ee the Hibernate website and Wiki for more information about this pattern, =
called <emphasis>Open Session in View</emphasis>-you'll need it as soon as =
you consider rendering your view in JSP, not in a servlet."
+#. Tag: para
+#: tutorial.xml:915
+#, no-c-format
+msgid "Finally, the unit of work ends when processing and rendering is com=
plete. If any problem occurred during processing or rendering, an exception=
 will be thrown and the database transaction rolled back. This completes th=
e <literal>session-per-request</literal> pattern. Instead of the transactio=
n demarcation code in every servlet you could also write a servlet filter. =
See the Hibernate website and Wiki for more information about this pattern,=
 called <emphasis>Open Session in View</emphasis>&mdash;you'll need it as s=
oon as you consider rendering your view in JSP, not in a servlet."
 msgstr ""
 =

-#: tutorial.xml:1361(title) =

+#. Tag: title
+#: tutorial.xml:929
+#, no-c-format
 msgid "Processing and rendering"
 msgstr ""
 =

-#: tutorial.xml:1363(para) =

+#. Tag: para
+#: tutorial.xml:931
+#, no-c-format
 msgid "Let's implement the processing of the request and rendering of the =
page."
 msgstr ""
 =

-#: tutorial.xml:1394(para) =

-msgid "Granted, this coding style with a mix of Java and HTML would not sc=
ale in a more complex application-keep in mind that we are only illustratin=
g basic Hibernate concepts in this tutorial. The code prints an HTML header=
 and a footer. Inside this page, an HTML form for event entry and a list of=
 all events in the database are printed. The first method is trivial and on=
ly outputs HTML:"
+#. Tag: programlisting
+#: tutorial.xml:935
+#, no-c-format
+msgid ""
+      "<![CDATA[// Write HTML header\n"
+      "PrintWriter out =3D response.getWriter();\n"
+      "out.println(\"<html><head><title>Event Manager</title></head><body>=
\");\n"
+      "\n"
+      "// Handle actions\n"
+      "if ( \"store\".equals(request.getParameter(\"action\")) ) {\n"
+      "\n"
+      "    String eventTitle =3D request.getParameter(\"eventTitle\");\n"
+      "    String eventDate =3D request.getParameter(\"eventDate\");\n"
+      "\n"
+      "    if ( \"\".equals(eventTitle) || \"\".equals(eventDate) ) {\n"
+      "        out.println(\"<b><i>Please enter event title and date.</i><=
/b>\");\n"
+      "    } else {\n"
+      "        createAndStoreEvent(eventTitle, dateFormatter.parse(eventDa=
te));\n"
+      "        out.println(\"<b><i>Added event.</i></b>\");\n"
+      "    }\n"
+      "}\n"
+      "\n"
+      "// Print page\n"
+      "printEventForm(out);\n"
+      "listEvents(out, dateFormatter);\n"
+      "\n"
+      "// Write HTML footer\n"
+      "out.println(\"</body></html>\");\n"
+      "out.flush();\n"
+      "out.close();]]>"
 msgstr ""
 =

-#: tutorial.xml:1412(para) =

+#. Tag: para
+#: tutorial.xml:937
+#, no-c-format
+msgid "Granted, this coding style with a mix of Java and HTML would not sc=
ale in a more complex application&mdash;keep in mind that we are only illus=
trating basic Hibernate concepts in this tutorial. The code prints an HTML =
header and a footer. Inside this page, an HTML form for event entry and a l=
ist of all events in the database are printed. The first method is trivial =
and only outputs HTML:"
+msgstr ""
+
+#. Tag: programlisting
+#: tutorial.xml:946
+#, no-c-format
+msgid ""
+      "<![CDATA[private void printEventForm(PrintWriter out) {\n"
+      "    out.println(\"<h2>Add new event:</h2>\");\n"
+      "    out.println(\"<form>\");\n"
+      "    out.println(\"Title: <input name=3D'eventTitle' length=3D'50'/>=
<br/>\");\n"
+      "    out.println(\"Date (e.g. 24.12.2009): <input name=3D'eventDate'=
 length=3D'10'/><br/>\");\n"
+      "    out.println(\"<input type=3D'submit' name=3D'action' value=3D's=
tore'/>\");\n"
+      "    out.println(\"</form>\");\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:948
+#, no-c-format
 msgid "The <literal>listEvents()</literal> method uses the Hibernate <lite=
ral>Session</literal> bound to the current thread to execute a query:"
 msgstr ""
 =

-#: tutorial.xml:1440(para) =

+#. Tag: programlisting
+#: tutorial.xml:954
+#, no-c-format
+msgid ""
+      "<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat =
dateFormatter) {\n"
+      "\n"
+      "    List result =3D HibernateUtil.getSessionFactory()\n"
+      "                    .getCurrentSession().createCriteria(Event.class=
).list();\n"
+      "    if (result.size() > 0) {\n"
+      "        out.println(\"<h2>Events in database:</h2>\");\n"
+      "        out.println(\"<table border=3D'1'>\");\n"
+      "        out.println(\"<tr>\");\n"
+      "        out.println(\"<th>Event title</th>\");\n"
+      "        out.println(\"<th>Event date</th>\");\n"
+      "        out.println(\"</tr>\");\n"
+      "        for (Iterator it =3D result.iterator(); it.hasNext();) {\n"
+      "            Event event =3D (Event) it.next();\n"
+      "            out.println(\"<tr>\");\n"
+      "            out.println(\"<td>\" + event.getTitle() + \"</td>\");\n"
+      "            out.println(\"<td>\" + dateFormatter.format(event.getDa=
te()) + \"</td>\");\n"
+      "            out.println(\"</tr>\");\n"
+      "        }\n"
+      "        out.println(\"</table>\");\n"
+      "    }\n"
+      "}]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:956
+#, no-c-format
 msgid "Finally, the <literal>store</literal> action is dispatched to the <=
literal>createAndStoreEvent()</literal> method, which also uses the <litera=
l>Session</literal> of the current thread:"
 msgstr ""
 =

-#: tutorial.xml:1455(para) =

-msgid "That's it, the servlet is complete. A request to the servlet will b=
e processed in a single <literal>Session</literal> and <literal>Transaction=
</literal>. As earlier in the standalone application, Hibernate can automat=
ically bind these ojects to the current thread of execution. This gives you=
 the freedom to layer your code and access the <literal>SessionFactory</lit=
eral> in any way you like. Usually you'd use a more sophisticated design an=
d move the data access code into data access objects (the DAO pattern). See=
 the Hibernate Wiki for more examples."
+#. Tag: programlisting
+#: tutorial.xml:962
+#, no-c-format
+msgid ""
+      "<![CDATA[protected void createAndStoreEvent(String title, Date theD=
ate) {\n"
+      "    Event theEvent =3D new Event();\n"
+      "    theEvent.setTitle(title);\n"
+      "    theEvent.setDate(theDate);\n"
+      "\n"
+      "    HibernateUtil.getSessionFactory()\n"
+      "                    .getCurrentSession().save(theEvent);\n"
+      "}]]>"
 msgstr ""
 =

-#: tutorial.xml:1469(title) =

+#. Tag: para
+#: tutorial.xml:964
+#, no-c-format
+msgid "That's it, the servlet is complete. A request to the servlet will b=
e processed in a single <literal>Session</literal> and <literal>Transaction=
</literal>. As earlier in the standalone application, Hibernate can automat=
ically bind these objects to the current thread of execution. This gives yo=
u the freedom to layer your code and access the <literal>SessionFactory</li=
teral> in any way you like. Usually you'd use a more sophisticated design a=
nd move the data access code into data access objects (the DAO pattern). Se=
e the Hibernate Wiki for more examples."
+msgstr ""
+
+#. Tag: title
+#: tutorial.xml:978
+#, no-c-format
 msgid "Deploying and testing"
 msgstr ""
 =

-#: tutorial.xml:1471(para) =

+#. Tag: para
+#: tutorial.xml:980
+#, no-c-format
 msgid "To deploy this application you have to create a web archive, a WAR.=
 Add the following Ant target to your <literal>build.xml</literal>:"
 msgstr ""
 =

-#: tutorial.xml:1486(para) =

+#. Tag: programlisting
+#: tutorial.xml:985
+#, no-c-format
+msgid ""
+      "<![CDATA[<target name=3D\"war\" depends=3D\"compile\">\n"
+      "    <war destfile=3D\"hibernate-tutorial.war\" webxml=3D\"web.xml\"=
>\n"
+      "        <lib dir=3D\"${librarydir}\">\n"
+      "          <exclude name=3D\"jsdk*.jar\"/>\n"
+      "        </lib>\n"
+      "\n"
+      "        <classes dir=3D\"${targetdir}\"/>\n"
+      "    </war>\n"
+      "</target>]]>"
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:987
+#, no-c-format
 msgid "This target creates a file called <literal>hibernate-tutorial.war</=
literal> in your project directory. It packages all libraries and the <lite=
ral>web.xml</literal> descriptor, which is expected in the base directory o=
f your project:"
 msgstr ""
 =

-#: tutorial.xml:1509(para) =

-msgid "Before you compile and deploy the web application, note that an add=
itional library is required: <literal>jsdk.jar</literal>. This is the Java =
servlet development kit, if you don't have this library already, get it fro=
m the Sun website and copy it to your library directory. However, it will b=
e only used for compliation and excluded from the WAR package."
+#. Tag: programlisting
+#: tutorial.xml:993
+#, no-c-format
+msgid ""
+      "<![CDATA[<?xml version=3D\"1.0\" encoding=3D\"UTF-8\"?>\n"
+      "<web-app version=3D\"2.4\"\n"
+      "    xmlns=3D\"http://java.sun.com/xml/ns/j2ee\"\n"
+      "    xmlns:xsi=3D\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+      "    xsi:schemaLocation=3D\"http://java.sun.com/xml/ns/j2ee http://j=
ava.sun.com/xml/ns/j2ee/web-app_2_4.xsd\">\n"
+      "\n"
+      "    <servlet>\n"
+      "        <servlet-name>Event Manager</servlet-name>\n"
+      "        <servlet-class>events.EventManagerServlet</servlet-class>\n"
+      "    </servlet>\n"
+      "\n"
+      "    <servlet-mapping>\n"
+      "        <servlet-name>Event Manager</servlet-name>\n"
+      "        <url-pattern>/eventmanager</url-pattern>\n"
+      "    </servlet-mapping>\n"
+      "</web-app>]]>"
 msgstr ""
 =

-#: tutorial.xml:1517(para) =

+#. Tag: para
+#: tutorial.xml:995
+#, no-c-format
+msgid "Before you compile and deploy the web application, note that an add=
itional library is required: <literal>jsdk.jar</literal>. This is the Java =
servlet development kit, if you don't have this library already, get it fro=
m the Sun website and copy it to your library directory. However, it will b=
e only used for compilation and excluded from the WAR package."
+msgstr ""
+
+#. Tag: para
+#: tutorial.xml:1003
+#, no-c-format
 msgid "To build and deploy call <literal>ant war</literal> in your project=
 directory and copy the <literal>hibernate-tutorial.war</literal> file into=
 your Tomcat <literal>webapp</literal> directory. If you don't have Tomcat =
installed, download it and follow the installation instructions. You don't =
have to change any Tomcat configuration to deploy this application though."
 msgstr ""
 =

-#: tutorial.xml:1525(para) =

+#. Tag: para
+#: tutorial.xml:1011
+#, no-c-format
 msgid "Once deployed and Tomcat is running, access the application at <lit=
eral>http://localhost:8080/hibernate-tutorial/eventmanager</literal>. Make =
sure you watch the Tomcat log to see Hibernate initialize when the first re=
quest hits your servlet (the static initializer in <literal>HibernateUtil</=
literal> is called) and to get the detailed output if any exceptions occurs=
."
 msgstr ""
 =

-#: tutorial.xml:1538(title) =

+#. Tag: title
+#: tutorial.xml:1024
+#, no-c-format
 msgid "Summary"
 msgstr ""
 =

-#: tutorial.xml:1540(para) =

+#. Tag: para
+#: tutorial.xml:1026
+#, no-c-format
 msgid "This tutorial covered the basics of writing a simple standalone Hib=
ernate application and a small web application."
 msgstr ""
 =

-#: tutorial.xml:1545(para) =

+#. Tag: para
+#: tutorial.xml:1031
+#, no-c-format
 msgid "If you already feel confident with Hibernate, continue browsing thr=
ough the reference documentation table of contents for topics you find inte=
resting - most asked are transactional processing (<xref linkend=3D\"transa=
ctions\"/>), fetch performance (<xref linkend=3D\"performance\"/>), or the =
usage of the API (<xref linkend=3D\"objectstate\"/>) and the query features=
 (<xref linkend=3D\"objectstate-querying\"/>)."
 msgstr ""
 =

-#: tutorial.xml:1553(para) =

+#. Tag: para
+#: tutorial.xml:1039
+#, no-c-format
 msgid "Don't forget to check the Hibernate website for more (specialized) =
tutorials."
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: tutorial.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/xml.=
pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot	20=
08-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot	20=
08-05-07 21:02:35 UTC (rev 14653)
@@ -1,120 +1,356 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:35-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: xml.xml:5(title) =

+#. Tag: title
+#: xml.xml:29
+#, no-c-format
 msgid "XML Mapping"
 msgstr ""
 =

-#: xml.xml:7(emphasis) =

+#. Tag: emphasis
+#: xml.xml:31
+#, no-c-format
 msgid "Note that this is an experimental feature in Hibernate 3.0 and is u=
nder extremely active development."
 msgstr ""
 =

-#: xml.xml:13(title) =

+#. Tag: title
+#: xml.xml:37
+#, no-c-format
 msgid "Working with XML data"
 msgstr ""
 =

-#: xml.xml:15(para) =

+#. Tag: para
+#: xml.xml:39
+#, no-c-format
 msgid "Hibernate lets you work with persistent XML data in much the same w=
ay you work with persistent POJOs. A parsed XML tree can be thought of as j=
ust another way to represent the relational data at the object level, inste=
ad of POJOs."
 msgstr ""
 =

-#: xml.xml:22(para) =

+#. Tag: para
+#: xml.xml:46
+#, no-c-format
 msgid "Hibernate supports dom4j as API for manipulating XML trees. You can=
 write queries that retrieve dom4j trees from the database and have any mod=
ification you make to the tree automatically synchronized to the database. =
You can even take an XML document, parse it using dom4j, and write it to th=
e database with any of Hibernate's basic operations: <literal>persist(), sa=
veOrUpdate(), merge(), delete(), replicate()</literal> (merging is not yet =
supported)."
 msgstr ""
 =

-#: xml.xml:32(para) =

+#. Tag: para
+#: xml.xml:56
+#, no-c-format
 msgid "This feature has many applications including data import/export, ex=
ternalization of entity data via JMS or SOAP and XSLT-based reporting."
 msgstr ""
 =

-#: xml.xml:37(para) =

+#. Tag: para
+#: xml.xml:61
+#, no-c-format
 msgid "A single mapping may be used to simultaneously map properties of a =
class and nodes of an XML document to the database, or, if there is no clas=
s to map, it may be used to map just the XML."
 msgstr ""
 =

-#: xml.xml:44(title) =

+#. Tag: title
+#: xml.xml:68
+#, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr ""
 =

-#: xml.xml:46(para) =

+#. Tag: para
+#: xml.xml:70
+#, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr ""
 =

-#: xml.xml:73(title) =

+#. Tag: programlisting
+#: xml.xml:74
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Account\" \n"
+      "        table=3D\"ACCOUNTS\" \n"
+      "        node=3D\"account\">\n"
+      "        \n"
+      "    <id name=3D\"accountId\" \n"
+      "            column=3D\"ACCOUNT_ID\" \n"
+      "            node=3D\"@id\"/>\n"
+      "            \n"
+      "    <many-to-one name=3D\"customer\" \n"
+      "            column=3D\"CUSTOMER_ID\" \n"
+      "            node=3D\"customer/@id\" \n"
+      "            embed-xml=3D\"false\"/>\n"
+      "            \n"
+      "    <property name=3D\"balance\" \n"
+      "            column=3D\"BALANCE\" \n"
+      "            node=3D\"balance\"/>\n"
+      "            \n"
+      "    ...\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: title
+#: xml.xml:78
+#, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr ""
 =

-#: xml.xml:75(para) =

+#. Tag: para
+#: xml.xml:80
+#, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr ""
 =

-#: xml.xml:103(para) =

+#. Tag: programlisting
+#: xml.xml:84
+#, no-c-format
+msgid ""
+      "<![CDATA[<class entity-name=3D\"Account\" \n"
+      "        table=3D\"ACCOUNTS\" \n"
+      "        node=3D\"account\">\n"
+      "        \n"
+      "    <id name=3D\"id\" \n"
+      "            column=3D\"ACCOUNT_ID\" \n"
+      "            node=3D\"@id\" \n"
+      "            type=3D\"string\"/>\n"
+      "            \n"
+      "    <many-to-one name=3D\"customerId\" \n"
+      "            column=3D\"CUSTOMER_ID\" \n"
+      "            node=3D\"customer/@id\" \n"
+      "            embed-xml=3D\"false\" \n"
+      "            entity-name=3D\"Customer\"/>\n"
+      "            \n"
+      "    <property name=3D\"balance\" \n"
+      "            column=3D\"BALANCE\" \n"
+      "            node=3D\"balance\" \n"
+      "            type=3D\"big_decimal\"/>\n"
+      "            \n"
+      "    ...\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: xml.xml:86
+#, no-c-format
 msgid "This mapping allows you to access the data as a dom4j tree, or as a=
 graph of property name/value pairs (java <literal>Map</literal>s). The pro=
perty names are purely logical constructs that may be referred to in HQL qu=
eries."
 msgstr ""
 =

-#: xml.xml:114(title) =

+#. Tag: title
+#: xml.xml:97
+#, no-c-format
 msgid "XML mapping metadata"
 msgstr ""
 =

-#: xml.xml:116(para) =

+#. Tag: para
+#: xml.xml:99
+#, no-c-format
 msgid "Many Hibernate mapping elements accept the <literal>node</literal> =
attribute. This let's you specify the name of an XML attribute or element t=
hat holds the property or entity data. The format of the <literal>node</lit=
eral> attribute must be one of the following:"
 msgstr ""
 =

-#: xml.xml:125(para) =

+#. Tag: para
+#: xml.xml:108
+#, no-c-format
 msgid "<literal>\"element-name\"</literal> - map to the named XML element"
 msgstr ""
 =

-#: xml.xml:128(para) =

+#. Tag: para
+#: xml.xml:111
+#, no-c-format
 msgid "<literal>\"@attribute-name\"</literal> - map to the named XML attri=
bute"
 msgstr ""
 =

-#: xml.xml:131(para) =

+#. Tag: para
+#: xml.xml:114
+#, no-c-format
 msgid "<literal>\".\"</literal> - map to the parent element"
 msgstr ""
 =

-#: xml.xml:134(para) =

+#. Tag: para
+#: xml.xml:117
+#, no-c-format
 msgid "<literal>\"element-name/@attribute-name\"</literal> - map to the na=
med attribute of the named element"
 msgstr ""
 =

-#: xml.xml:141(para) =

+#. Tag: para
+#: xml.xml:124
+#, no-c-format
 msgid "For collections and single valued associations, there is an additio=
nal <literal>embed-xml</literal> attribute. If <literal>embed-xml=3D\"true\=
"</literal>, the default, the XML tree for the associated entity (or collec=
tion of value type) will be embedded directly in the XML tree for the entit=
y that owns the association. Otherwise, if <literal>embed-xml=3D\"false\"</=
literal>, then only the referenced identifier value will appear in the XML =
for single point associations and collections will simply not appear at all=
."
 msgstr ""
 =

-#: xml.xml:151(para) =

+#. Tag: para
+#: xml.xml:134
+#, no-c-format
 msgid "You should be careful not to leave <literal>embed-xml=3D\"true\"</l=
iteral> for too many associations, since XML does not deal well with circul=
arity!"
 msgstr ""
 =

-#: xml.xml:191(para) =

+#. Tag: programlisting
+#: xml.xml:139
+#, no-c-format
+msgid ""
+      "<![CDATA[<class name=3D\"Customer\" \n"
+      "        table=3D\"CUSTOMER\" \n"
+      "        node=3D\"customer\">\n"
+      "        \n"
+      "    <id name=3D\"id\" \n"
+      "            column=3D\"CUST_ID\" \n"
+      "            node=3D\"@id\"/>\n"
+      "            \n"
+      "    <map name=3D\"accounts\" \n"
+      "            node=3D\".\" \n"
+      "            embed-xml=3D\"true\">\n"
+      "        <key column=3D\"CUSTOMER_ID\" \n"
+      "                not-null=3D\"true\"/>\n"
+      "        <map-key column=3D\"SHORT_DESC\" \n"
+      "                node=3D\"@short-desc\" \n"
+      "                type=3D\"string\"/>\n"
+      "        <one-to-many entity-name=3D\"Account\"\n"
+      "                embed-xml=3D\"false\" \n"
+      "                node=3D\"account\"/>\n"
+      "    </map>\n"
+      "    \n"
+      "    <component name=3D\"name\" \n"
+      "            node=3D\"name\">\n"
+      "        <property name=3D\"firstName\" \n"
+      "                node=3D\"first-name\"/>\n"
+      "        <property name=3D\"initial\" \n"
+      "                node=3D\"initial\"/>\n"
+      "        <property name=3D\"lastName\" \n"
+      "                node=3D\"last-name\"/>\n"
+      "    </component>\n"
+      "    \n"
+      "    ...\n"
+      "    \n"
+      "</class>]]>"
+msgstr ""
+
+#. Tag: para
+#: xml.xml:141
+#, no-c-format
 msgid "in this case, we have decided to embed the collection of account id=
s, but not the actual account data. The following HQL query:"
 msgstr ""
 =

-#: xml.xml:198(para) =

+#. Tag: programlisting
+#: xml.xml:146
+#, no-c-format
+msgid "<![CDATA[from Customer c left join fetch c.accounts where c.lastNam=
e like :lastName]]>"
+msgstr ""
+
+#. Tag: para
+#: xml.xml:148
+#, no-c-format
 msgid "Would return datasets such as this:"
 msgstr ""
 =

-#: xml.xml:213(para) =

+#. Tag: programlisting
+#: xml.xml:152
+#, no-c-format
+msgid ""
+      "<![CDATA[<customer id=3D\"123456789\">\n"
+      "    <account short-desc=3D\"Savings\">987632567</account>\n"
+      "    <account short-desc=3D\"Credit Card\">985612323</account>\n"
+      "    <name>\n"
+      "        <first-name>Gavin</first-name>\n"
+      "        <initial>A</initial>\n"
+      "        <last-name>King</last-name>\n"
+      "    </name>\n"
+      "    ...\n"
+      "</customer>]]>"
+msgstr ""
+
+#. Tag: para
+#: xml.xml:154
+#, no-c-format
 msgid "If you set <literal>embed-xml=3D\"true\"</literal> on the <literal>=
&lt;one-to-many&gt;</literal> mapping, the data might look more like this:"
 msgstr ""
 =

-#: xml.xml:239(title) =

+#. Tag: programlisting
+#: xml.xml:159
+#, no-c-format
+msgid ""
+      "<![CDATA[<customer id=3D\"123456789\">\n"
+      "    <account id=3D\"987632567\" short-desc=3D\"Savings\">\n"
+      "        <customer id=3D\"123456789\"/>\n"
+      "        <balance>100.29</balance>\n"
+      "    </account>\n"
+      "    <account id=3D\"985612323\" short-desc=3D\"Credit Card\">\n"
+      "        <customer id=3D\"123456789\"/>\n"
+      "        <balance>-2370.34</balance>\n"
+      "    </account>\n"
+      "    <name>\n"
+      "        <first-name>Gavin</first-name>\n"
+      "        <initial>A</initial>\n"
+      "        <last-name>King</last-name>\n"
+      "    </name>\n"
+      "    ...\n"
+      "</customer>]]>"
+msgstr ""
+
+#. Tag: title
+#: xml.xml:165
+#, no-c-format
 msgid "Manipulating XML data"
 msgstr ""
 =

-#: xml.xml:241(para) =

+#. Tag: para
+#: xml.xml:167
+#, no-c-format
 msgid "Let's rearead and update XML documents in the application. We do th=
is by obtaining a dom4j session:"
 msgstr ""
 =

-#: xml.xml:281(para) =

-msgid "It is extremely useful to combine this feature with Hibernate's <li=
teral>replicate()</literal> operation to implement XML-based data import/ex=
port."
+#. Tag: programlisting
+#: xml.xml:172
+#, no-c-format
+msgid ""
+      "<![CDATA[Document doc =3D ....;\n"
+      "       \n"
+      "Session session =3D factory.openSession();\n"
+      "Session dom4jSession =3D session.getSession(EntityMode.DOM4J);\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "\n"
+      "List results =3D dom4jSession\n"
+      "    .createQuery(\"from Customer c left join fetch c.accounts where=
 c.lastName like :lastName\")\n"
+      "    .list();\n"
+      "for ( int i=3D0; i<results.size(); i++ ) {\n"
+      "    //add the customer data to the XML document\n"
+      "    Element customer =3D (Element) results.get(i);\n"
+      "    doc.add(customer);\n"
+      "}\n"
+      "\n"
+      "tx.commit();\n"
+      "session.close();]]>"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: xml.xml:0(None) =

-msgid "translator-credits"
+#. Tag: programlisting
+#: xml.xml:174
+#, no-c-format
+msgid ""
+      "<![CDATA[Session session =3D factory.openSession();\n"
+      "Session dom4jSession =3D session.getSession(EntityMode.DOM4J);\n"
+      "Transaction tx =3D session.beginTransaction();\n"
+      "\n"
+      "Element cust =3D (Element) dom4jSession.get(\"Customer\", customerI=
d);\n"
+      "for ( int i=3D0; i<results.size(); i++ ) {\n"
+      "    Element customer =3D (Element) results.get(i);\n"
+      "    //change the customer name in the XML and database\n"
+      "    Element name =3D customer.element(\"name\");\n"
+      "    name.element(\"first-name\").setText(firstName);\n"
+      "    name.element(\"initial\").setText(initial);\n"
+      "    name.element(\"last-name\").setText(lastName);\n"
+      "}\n"
+      "\n"
+      "tx.commit();\n"
+      "session.close();]]>"
 msgstr ""
 =

+#. Tag: para
+#: xml.xml:176
+#, no-c-format
+msgid "It is extremely useful to combine this feature with Hibernate's <li=
teral>replicate()</literal> operation to implement XML-based data import/ex=
port."
+msgstr ""
+

Modified: core/trunk/documentation/manual/src/main/docbook/pot/legal_notice=
.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot	2=
008-05-07 20:59:35 UTC (rev 14652)
+++ core/trunk/documentation/manual/src/main/docbook/pot/legal_notice.pot	2=
008-05-07 21:02:35 UTC (rev 14653)
@@ -1,96 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL(a)ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-10-19 10:26-0500\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2008-05-07 21:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL(a)ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc(a)kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=3DUTF-8\n"
+"Content-Type: application/x-xml2pot; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 =

-#: ./legal_notice.xml:20(title) =

+#. Tag: title
+#: legal_notice.xml:28
+#, no-c-format
 msgid "Legal Notice"
 msgstr ""
 =

-#: ./legal_notice.xml:23(street) =

-msgid "1801 Varsity Drive"
+#. Tag: address
+#: legal_notice.xml:30
+#, no-c-format
+msgid "<street>1801 Varsity Drive</street> <city>Raleigh</city>, <state>NC=
</state><postcode>27606-2072</postcode><country>USA</country> <phone>Phone:=
 +1 919 754 3700</phone> <phone>Phone: 888 733 4281</phone> <fax>Fax: +1 91=
9 754 3701</fax> <pob>PO Box 13588</pob><city>Research Triangle Park</city>=
, <state>NC</state><postcode>27709</postcode><country>USA</country>"
 msgstr ""
 =

-#: ./legal_notice.xml:24(city) =

-msgid "Raleigh"
+#. Tag: para
+#: legal_notice.xml:39
+#, no-c-format
+msgid "Copyright <trademark class=3D\"copyright\"></trademark> 2007 by Red=
 Hat, Inc. This copyrighted material is made available to anyone wishing to=
 use, modify, copy, or redistribute it subject to the terms and conditions =
of the GNU <ulink url=3D\"http://www.gnu.org/licenses/lgpl-2.1.html\">Lesse=
r General Public License</ulink>, as published by the Free Software Foundat=
ion."
 msgstr ""
 =

-#: ./legal_notice.xml:24(state) ./legal_notice.xml:28(state) =

-msgid "NC"
-msgstr ""
-
-#: ./legal_notice.xml:24(postcode) =

-msgid "27606-2072"
-msgstr ""
-
-#: ./legal_notice.xml:24(country) ./legal_notice.xml:28(country) =

-msgid "USA"
-msgstr ""
-
-#: ./legal_notice.xml:25(phone) =

-msgid "Phone: +1 919 754 3700"
-msgstr ""
-
-#: ./legal_notice.xml:26(phone) =

-msgid "Phone: 888 733 4281"
-msgstr ""
-
-#: ./legal_notice.xml:27(fax) =

-msgid "Fax: +1 919 754 3701"
-msgstr ""
-
-#: ./legal_notice.xml:28(pob) =

-msgid "PO Box 13588"
-msgstr ""
-
-#: ./legal_notice.xml:28(city) =

-msgid "Research Triangle Park"
-msgstr ""
-
-#: ./legal_notice.xml:28(postcode) =

-msgid "27709"
-msgstr ""
-
-#: ./legal_notice.xml:22(address) =

-msgid "<placeholder-1/><placeholder-2/>, <placeholder-3/><placeholder-4/><=
placeholder-5/><placeholder-6/><placeholder-7/><placeholder-8/><placeholder=
-9/><placeholder-10/>, <placeholder-11/><placeholder-12/><placeholder-13/>"
-msgstr ""
-
-#: ./legal_notice.xml:31(para) =

-msgid "Copyright <trademark class=3D\"copyright\"/> 2007 by Red Hat, Inc. =
This material may be distributed only subject to the terms and conditions s=
et forth in the Open Publication License, V1.0 or later (the latest version=
 is presently available at <ulink url=3D\"http://www.opencontent.org/openpu=
b/\">http://www.opencontent.org/openpub/</ulink>)."
-msgstr ""
-
-#: ./legal_notice.xml:34(para) =

-msgid "Distribution of substantively modified versions of this document is=
 prohibited without the explicit permission of the copyright holder."
-msgstr ""
-
-#: ./legal_notice.xml:37(para) =

-msgid "Distribution of the work or derivative of the work in any standard =
(paper) book form for commercial purposes is prohibited unless prior permis=
sion is obtained from the copyright holder."
-msgstr ""
-
-#: ./legal_notice.xml:40(para) =

+#. Tag: para
+#: legal_notice.xml:45
+#, no-c-format
 msgid "Red Hat and the Red Hat \"Shadow Man\" logo are registered trademar=
ks of Red Hat, Inc. in the United States and other countries."
 msgstr ""
 =

-#: ./legal_notice.xml:43(para) =

+#. Tag: para
+#: legal_notice.xml:48
+#, no-c-format
 msgid "All other trademarks referenced herein are the property of their re=
spective owners."
 msgstr ""
 =

-#: ./legal_notice.xml:46(para) =

+#. Tag: para
+#: legal_notice.xml:51
+#, no-c-format
 msgid "The GPG fingerprint of the security(a)redhat.com key is:"
 msgstr ""
 =

-#: ./legal_notice.xml:49(para) =

+#. Tag: para
+#: legal_notice.xml:54
+#, no-c-format
 msgid "CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E"
 msgstr ""
 =

-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ./legal_notice.xml:0(None) =

-msgid "translator-credits"
-msgstr ""
-


--===============2751703871400288007==--

From hibernate-commits at lists.jboss.org Thu May  8 14:35:31 2008
Content-Type: multipart/mixed; boundary="===============6782857483277230832=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14654 - in search/trunk/src:
 java/org/hibernate/search/backend/impl and 21 other directories.
Date: Thu, 08 May 2008 14:35:30 -0400
Message-ID: <E1JuAxm-0002xR-RU@committer01.frg.pub.inap.atl.jboss.com>

--===============6782857483277230832==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-08 14:35:30 -0400 (Thu, 08 May 2008)
New Revision: 14654

Modified:
   search/trunk/src/java/org/hibernate/search/backend/Workspace.java
   search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingP=
rocessor.java
   search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQu=
eueProcessorFactory.java
   search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java
   search/trunk/src/java/org/hibernate/search/bridge/builtin/BooleanBridge.=
java
   search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.java
   search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
   search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListe=
ner.java
   search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.ja=
va
   search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
   search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvide=
r.java
   search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.j=
ava
   search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.j=
ava
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactor=
y.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper=
.java
   search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java
   search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBrid=
ge.java
   search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlav=
eAndMasterDPTest.java
   search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/Ad=
dress.java
   search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
   search/trunk/src/test/org/hibernate/search/test/jpa/EntityManagerSeriali=
zationTest.java
   search/trunk/src/test/org/hibernate/search/test/jpa/JPATestCase.java
   search/trunk/src/test/org/hibernate/search/test/optimizer/OptimizerTestC=
ase.java
   search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTes=
t.java
   search/trunk/src/test/org/hibernate/search/test/reader/ReaderPerfTestCas=
e.java
   search/trunk/src/test/org/hibernate/search/test/session/OptimizeTest.java
   search/trunk/src/test/org/hibernate/search/test/shards/ShardsTest.java
   search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.ja=
va
Log:
Fix some things after code inspection

Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-08 18:35:30 UTC (rev 14654)
@@ -68,6 +68,7 @@
 	 * retrieve a read write IndexReader
 	 * For a given DirectoryProvider, An IndexReader must be used before an I=
ndexWriter
 	 */
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public IndexReader getIndexReader(DirectoryProvider provider, Class entit=
y) {
 		//one cannot access a reader for update after a writer has been accessed
 		if ( writers.containsKey( provider ) )
@@ -95,6 +96,7 @@
 	 * retrieve a read write IndexWriter
 	 * For a given DirectoryProvider, An IndexReader must be used before an I=
ndexWriter
 	 */
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public IndexWriter getIndexWriter(DirectoryProvider provider, Class entit=
y, boolean modificationOperation) {
 		//one has to close a reader for update before a writer is accessed
 		IndexReader reader =3D readers.get( provider );

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQu=
eueingProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -174,9 +174,8 @@
 =

 		public boolean isRightLayer(WorkType type) {
 			if (this =3D=3D FIRST && type !=3D WorkType.COLLECTION) return true;
-			if (this =3D=3D SECOND && type =3D=3D WorkType.COLLECTION) return true;
-			return false;
-		}
+			return this =3D=3D SECOND && type =3D=3D WorkType.COLLECTION;
+			}
 	}
 =

 }

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBa=
ckendQueueProcessorFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQ=
ueueProcessorFactory.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQ=
ueueProcessorFactory.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -87,7 +87,7 @@
 		}
 	}
 =

-	public static Properties getJndiProperties(Properties properties) {
+	private static Properties getJndiProperties(Properties properties) {
 =

 		HashSet specialProps =3D new HashSet();
 		specialProps.add( JNDI_PREFIX + "class" );

Modified: search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java	20=
08-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java	20=
08-05-08 18:35:30 UTC (rev 14654)
@@ -150,7 +150,7 @@
 	}
 =

 	public static FieldBridge guessType(Field field, XMember member, Reflecti=
onManager reflectionManager) {
-		FieldBridge bridge =3D null;
+		FieldBridge bridge;
 		org.hibernate.search.annotations.FieldBridge bridgeAnn;
 		//@Field bridge has priority over @FieldBridge
 		if ( field !=3D null && void.class !=3D field.bridge().impl() ) {

Modified: search/trunk/src/java/org/hibernate/search/bridge/builtin/Boolean=
Bridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/builtin/BooleanBridge=
.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/bridge/builtin/BooleanBridge=
.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -20,7 +20,7 @@
 	public String objectToString(Object object) {
 		return object =3D=3D null ?
 				null :
-				( (Boolean) object ).toString();
+				object.toString();
 	}
 }
 =


Modified: search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBri=
dge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.ja=
va	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.ja=
va	2008-05-08 18:35:30 UTC (rev 14654)
@@ -43,7 +43,7 @@
 	public static final TwoWayStringBridge DATE_SECOND =3D new DateBridge( Re=
solution.SECOND );
 	public static final TwoWayStringBridge DATE_MILLISECOND =3D new DateBridg=
e( Resolution.MILLISECOND );
 =

-	DateTools.Resolution resolution;
+	private DateTools.Resolution resolution;
 =

 	public DateBridge() {
 	}

Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-08 18:35:30 UTC (rev 14654)
@@ -261,9 +261,8 @@
 				propertiesMetadata.fieldIndex.add( getIndex( Index.UN_TOKENIZED ) );
 				propertiesMetadata.fieldTermVectors.add( getTermVector( TermVector.NO =
) );
 				propertiesMetadata.fieldBridges.add( BridgeFactory.guessType( null, me=
mber, reflectionManager ) );
-				// Field > property > entity analyzer
-				Analyzer analyzer =3D null; //no field analyzer
-				if ( analyzer =3D=3D null ) analyzer =3D getAnalyzer( member, context =
);
+				// property > entity analyzer (no field analyzer)
+				Analyzer analyzer =3D getAnalyzer( member, context );
 				if ( analyzer =3D=3D null ) analyzer =3D propertiesMetadata.analyzer;
 				if ( analyzer =3D=3D null ) throw new AssertionFailure( "Analizer shou=
ld not be undefined" );
 				this.analyzer.addScopedAnalyzer( fieldName, analyzer );

Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEve=
ntListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -35,6 +35,7 @@
 public class FullTextIndexEventListener implements PostDeleteEventListener=
, PostInsertEventListener,
 		PostUpdateEventListener, Initializable {
 =

+	@SuppressWarnings( { "WeakerAccess" } )
 	protected boolean used;
 	protected SearchFactoryImplementor searchFactoryImplementor;
 =

@@ -83,6 +84,7 @@
 		}
 	}
 =

+	@SuppressWarnings( { "WeakerAccess" } )
 	protected void processWork(Object entity, Serializable id, WorkType workT=
ype, AbstractEvent event) {
 		Work work =3D new Work(entity, id, workType);
 		searchFactoryImplementor.getWorker().performWork( work, event.getSession=
() );

Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQuery=
Impl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.j=
ava	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.j=
ava	2008-05-08 18:35:30 UTC (rev 14654)
@@ -105,6 +105,7 @@
 	}
 =

 	//TODO mutualize this code with the EM this will fix the rollback issues
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	private void throwPersistenceException(Exception e) {
 		if ( e instanceof StaleStateException ) {
 			PersistenceException pe =3D wrapStaleStateException( (StaleStateExcepti=
on) e );
@@ -135,14 +136,15 @@
 		}
 	}
 =

-	public void throwPersistenceException(PersistenceException e) {
+	void throwPersistenceException(PersistenceException e) {
 		if ( ! ( e instanceof NoResultException || e instanceof NonUniqueResultE=
xception ) ) {
 			//FIXME rollback
 		}
 		throw e;
 	}
 =

-	public PersistenceException wrapStaleStateException(StaleStateException e=
) {
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
+	PersistenceException wrapStaleStateException(StaleStateException e) {
 		PersistenceException pe;
 		if ( e instanceof StaleObjectStateException ) {
 			StaleObjectStateException sose =3D (StaleObjectStateException) e;
@@ -167,6 +169,7 @@
 		return pe;
 	}
 =

+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public Object getSingleResult() {
 		try {
 			List result =3D query.list();

Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImp=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-08 18:35:30 UTC (rev 14654)
@@ -487,7 +487,6 @@
 	}
 =

 	private void closeSearcher(Searcher searcher, ReaderProvider readerProvid=
er) {
-		boolean trace =3D log.isTraceEnabled();
 		Set<IndexReader> indexReaders =3D getIndexReaders( searcher );
 =

 		for (IndexReader indexReader : indexReaders) {

Modified: search/trunk/src/java/org/hibernate/search/reader/NotSharedReader=
Provider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvid=
er.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvid=
er.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -17,6 +17,7 @@
  * @author Emmanuel Bernard
  */
 public class NotSharedReaderProvider implements ReaderProvider {
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public IndexReader openReader(DirectoryProvider[] directoryProviders) {
 		final int length =3D directoryProviders.length;
 		IndexReader[] readers =3D new IndexReader[length];
@@ -33,6 +34,7 @@
 	}
 =

 =

+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public void closeReader(IndexReader reader) {
 		try {
 			reader.close();

Modified: search/trunk/src/java/org/hibernate/search/reader/ReaderProviderH=
elper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.=
java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.=
java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -15,6 +15,7 @@
  * @author Emmanuel Bernard
  */
 public abstract class ReaderProviderHelper {
+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public static IndexReader buildMultiReader(int length, IndexReader[] read=
ers) {
 		if ( length =3D=3D 0 ) {
 			return null;

Modified: search/trunk/src/java/org/hibernate/search/reader/SharedReaderPro=
vider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.=
java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.=
java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -121,6 +121,7 @@
 		return buildMultiReader( length, readers );
 	}
 =

+	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	private IndexReader replaceActiveReader(IndexReader outOfDateReader, Lock=
 directoryProviderLock, DirectoryProvider directoryProvider, IndexReader[] =
readers) {
 		boolean trace =3D log.isTraceEnabled();
 		IndexReader oldReader;

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -46,7 +46,7 @@
  * @author Hardy Ferentschik
  */
 public class DirectoryProviderFactory {
-	public List<DirectoryProvider<?>> providers =3D new ArrayList<DirectoryPr=
ovider<?>>();
+	private List<DirectoryProvider<?>> providers =3D new ArrayList<DirectoryP=
rovider<?>>();
 	private static String LUCENE_PREFIX =3D "hibernate.search.";
 	private static String LUCENE_DEFAULT =3D LUCENE_PREFIX + "default.";
 	private static String DEFAULT_DIRECTORY_PROVIDER =3D FSDirectoryProvider.=
class.getName();

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -38,8 +38,8 @@
 		File sourceDirectory;
 		if ( log.isTraceEnabled() ) {
 			log.trace(
-					"Guess source directory from " + ROOTINDEX_PROP_NAME + " " + root !=
=3D null ? root : "<null>"
-							+ " and " + RELATIVEINDEX_PROP_NAME + " " + relative !=3D null ? re=
lative : "<null>"
+					"Guess source directory from " + ROOTINDEX_PROP_NAME + " " + ( root !=
=3D null ? root : "<null>" )
+							+ " and " + RELATIVEINDEX_PROP_NAME + " " + (relative !=3D null ? r=
elative : "<null>")
 			);
 		}
 		if ( relative =3D=3D null ) relative =3D directoryProviderName;

Modified: search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java	20=
08-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java	20=
08-05-08 18:35:30 UTC (rev 14654)
@@ -45,8 +45,7 @@
 =

 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
-		File sub =3D new File( current, "indextemp" );
-		return sub;
+		return new File( current, "indextemp" );
 	}
 =

 	protected void tearDown() throws Exception {

Modified: search/trunk/src/test/org/hibernate/search/test/bridge/PaddedInte=
gerBridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBri=
dge.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBri=
dge.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -29,7 +29,7 @@
 	}
 =

 	public String objectToString(Object object) {
-		String rawInteger =3D ( (Integer) object ).toString();
+		String rawInteger =3D object.toString();
 		if (rawInteger.length() > padding) throw new IllegalArgumentException( "=
Try to pad on a number too big" );
 		StringBuilder paddedInteger =3D new StringBuilder( );
 		for ( int padIndex =3D rawInteger.length() ; padIndex < padding ; padInd=
ex++ ) {

Modified: search/trunk/src/test/org/hibernate/search/test/directoryProvider=
/FSSlaveAndMasterDPTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSla=
veAndMasterDPTest.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSla=
veAndMasterDPTest.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -22,6 +22,7 @@
  */
 public class FSSlaveAndMasterDPTest extends MultipleSFTestCase {
 =

+	@SuppressWarnings( { "PointlessArithmeticExpression" } )
 	public void testProperCopy() throws Exception {
 		Session s1 =3D getSessionFactories()[0].openSession( );
 		SnowStorm sn =3D new SnowStorm();

Modified: search/trunk/src/test/org/hibernate/search/test/embedded/doublein=
sert/Address.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/A=
ddress.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/A=
ddress.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -196,9 +196,8 @@
 		if ( ! equals(this.getCounty(), that.getCounty() ) ) return false;
 		if ( ! equals(this.getTown(), that.getTown() ) ) return false;
 		if ( ! equals(this.getPostcode(), that.getPostcode() ) ) return false;
-		if ( ! equals(this.getContact(), that.getContact() ) ) return false;
-		return true;
-//		EqualsBuilder equalsBuilder =3D new EqualsBuilder();
+		return equals( this.getContact(), that.getContact() );
+		//		EqualsBuilder equalsBuilder =3D new EqualsBuilder();
 //		return equalsBuilder.append(new Object[]{this.getAddress1(), this.getA=
ddress2(), this.getCounty(), this.getTown(), this.getPostcode(), this.conta=
ct}, new Object[]{address.getAddress1(), address.getAddress2(), address.get=
County(), address.getTown(), address.getPostcode(), address.getContact()}).=
isEquals();
 	}
 =


Modified: search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/filter/Driver.java	2008=
-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/filter/Driver.java	2008=
-05-08 18:35:30 UTC (rev 14654)
@@ -88,10 +88,9 @@
 		if ( score !=3D driver.score ) return false;
 		if ( delivery !=3D null ? !delivery.equals( driver.delivery ) : driver.d=
elivery !=3D null ) return false;
 		if ( name !=3D null ? !name.equals( driver.name ) : driver.name !=3D nul=
l ) return false;
-		if ( teacher !=3D null ? !teacher.equals( driver.teacher ) : driver.teac=
her !=3D null ) return false;
+		return !( teacher !=3D null ? !teacher.equals( driver.teacher ) : driver=
.teacher !=3D null );
 =

-		return true;
-	}
+		}
 =

 	public int hashCode() {
 		int result;

Modified: search/trunk/src/test/org/hibernate/search/test/jpa/EntityManager=
SerializationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/jpa/EntityManagerSerial=
izationTest.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/jpa/EntityManagerSerial=
izationTest.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -81,7 +81,7 @@
 =

 	public Class[] getAnnotatedClasses() {
 		return new Class[] { Bretzel.class };
-	};
+	}
 =

 	/**
 	 * Helper method for testing the entity manager before and after

Modified: search/trunk/src/test/org/hibernate/search/test/jpa/JPATestCase.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/jpa/JPATestCase.java	20=
08-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/jpa/JPATestCase.java	20=
08-05-08 18:35:30 UTC (rev 14654)
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Properties;
-import java.util.ArrayList;
+import java.util.ArrayList;import java.util.Arrays;
 import java.io.InputStream;
 import java.io.IOException;
 import javax.persistence.EntityManagerFactory;
@@ -77,9 +77,7 @@
 		Map config =3D loadProperties();
 		ArrayList<Class> classes =3D new ArrayList<Class>();
 =

-		for ( Class clazz : getAnnotatedClasses() ) {
-			classes.add( clazz );
-		}
+		classes.addAll( Arrays.asList( getAnnotatedClasses() ) );
 		config.put( HibernatePersistence.LOADED_CLASSES, classes );
 		for ( Map.Entry<Class, String> entry : getCachedClasses().entrySet() ) {
 			config.put(
@@ -95,9 +93,7 @@
 		}
 		if ( getEjb3DD().length > 0 ) {
 			ArrayList<String> dds =3D new ArrayList<String>();
-			for ( String dd : getEjb3DD() ) {
-				dds.add( dd );
-			}
+			dds.addAll( Arrays.asList( getEjb3DD() ) );
 			config.put( HibernatePersistence.XML_FILE_NAMES, dds );
 		}
 =


Modified: search/trunk/src/test/org/hibernate/search/test/optimizer/Optimiz=
erTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/optimizer/OptimizerTest=
Case.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/optimizer/OptimizerTest=
Case.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -37,6 +37,7 @@
 		buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles(=
) );
 	}
 =

+	@SuppressWarnings( { "UnnecessaryLocalVariable" } )
 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
 		File sub =3D new File( current, "indextemp" );

Modified: search/trunk/src/test/org/hibernate/search/test/query/LuceneQuery=
SortTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTe=
st.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTe=
st.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -116,7 +116,7 @@
 	private void createTestBooks(FullTextSession s) {
 		Transaction tx =3D s.beginTransaction();
 		Calendar cal =3D Calendar.getInstance( );
-		cal.set( 2007, 07, 25, 11, 20, 30);
+		cal.set( 2007, 7, 25, 11, 20, 30);
 		Book book =3D new Book(1, "Hibernate & Lucene", "This is a test book.");
 		book.setPublicationDate( cal.getTime() );
 		s.save(book);

Modified: search/trunk/src/test/org/hibernate/search/test/reader/ReaderPerf=
TestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/reader/ReaderPerfTestCa=
se.java	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/reader/ReaderPerfTestCa=
se.java	2008-05-08 18:35:30 UTC (rev 14654)
@@ -52,8 +52,7 @@
 =

 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
-		File sub =3D new File( current, "indextemp" );
-		return sub;
+		return new File( current, "indextemp" );
 	}
 =

 	protected void tearDown() throws Exception {

Modified: search/trunk/src/test/org/hibernate/search/test/session/OptimizeT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/session/OptimizeTest.ja=
va	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/session/OptimizeTest.ja=
va	2008-05-08 18:35:30 UTC (rev 14654)
@@ -76,8 +76,7 @@
 =

 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
-		File sub =3D new File( current, "indextemp" );
-		return sub;
+		return new File( current, "indextemp" );
 	}
 =

 	protected void tearDown() throws Exception {

Modified: search/trunk/src/test/org/hibernate/search/test/shards/ShardsTest=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/shards/ShardsTest.java	=
2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/shards/ShardsTest.java	=
2008-05-08 18:35:30 UTC (rev 14654)
@@ -167,8 +167,7 @@
 =

 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
-		File sub =3D new File( current, "indextemp" );
-		return sub;
+		return new File( current, "indextemp" );
 	}
 =

 	protected void tearDown() throws Exception {

Modified: search/trunk/src/test/org/hibernate/search/test/worker/WorkerTest=
Case.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.j=
ava	2008-05-07 21:02:35 UTC (rev 14653)
+++ search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.j=
ava	2008-05-08 18:35:30 UTC (rev 14654)
@@ -42,8 +42,7 @@
 =

 	private File getBaseIndexDir() {
 		File current =3D new File( "." );
-		File sub =3D new File( current, "indextemp" );
-		return sub;
+		return new File( current, "indextemp" );
 	}
 =

 	protected void tearDown() throws Exception {


--===============6782857483277230832==--

From hibernate-commits at lists.jboss.org Fri May  9 13:07:32 2008
Content-Type: multipart/mixed; boundary="===============2091326874681622064=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14655 -
 core/branches/Branch_3_2_4_SP1_CP.
Date: Fri, 09 May 2008 13:07:31 -0400
Message-ID: <E1JuW4B-0005GP-Tj@committer01.frg.pub.inap.atl.jboss.com>

--===============2091326874681622064==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-09 13:07:31 -0400 (Fri, 09 May 2008)
New Revision: 14655

Modified:
   core/branches/Branch_3_2_4_SP1_CP/build.xml
Log:
change Javadoc source and link arguments to be consistent with javac (-sour=
ce=3D1.4)


Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/build.xml	2008-05-08 18:35:30 UTC (re=
v 14654)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml	2008-05-09 17:07:31 UTC (re=
v 14655)
@@ -59,7 +59,7 @@
     <property name=3D"dir.dist" value=3D"${dir.build}/dist" />
 =

     <!-- Define various operational options -->
-	<property name=3D"javadoc.url.jse" value=3D"http://java.sun.com/j2se/1.3/=
docs/api"/>
+	<property name=3D"javadoc.url.jse" value=3D"http://java.sun.com/j2se/1.4/=
docs/api"/>
 	<property name=3D"javac.debug" value=3D"on"/>
 	<property name=3D"javac.optimize" value=3D"off"/>
 	<property name=3D"javac.target" value=3D"1.4"/>
@@ -778,6 +778,7 @@
                 windowtitle=3D"${Name} API Documentation"
                 Overview=3D"${dir.doc.api}/package.html"
                 stylesheetfile=3D"${dir.doc.api}/jdstyle.css"
+                source=3D"${javac.source}"
                 link=3D"${javadoc.url.jse}">
 			<packageset dir=3D"${dir.out.generated-source}" defaultexcludes=3D"yes">
 				<include name=3D"org/hibernate/**" />


--===============2091326874681622064==--

From hibernate-commits at lists.jboss.org Fri May  9 19:23:30 2008
Content-Type: multipart/mixed; boundary="===============6381258290745872795=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14656 - in core/trunk:
 core/src/main/java/org/hibernate/type and 1 other directories.
Date: Fri, 09 May 2008 19:23:30 -0400
Message-ID: <E1Jubw2-0006LT-4G@committer01.frg.pub.inap.atl.jboss.com>

--===============6381258290745872795==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-09 19:23:29 -0400 (Fri, 09 May 2008)
New Revision: 14656

Added:
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/A.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/G.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/H.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathC=
ascade.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathC=
ascadeTest.java
Modified:
   core/trunk/core/src/main/java/org/hibernate/event/def/DefaultMergeEventL=
istener.java
   core/trunk/core/src/main/java/org/hibernate/type/EntityType.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/CascadeSui=
te.java
Log:
HHH-3229 : Cascade merge transient entities regardless of property traversa=
l order


Modified: core/trunk/core/src/main/java/org/hibernate/event/def/DefaultMerg=
eEventListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/event/def/DefaultMergeEvent=
Listener.java	2008-05-09 17:07:31 UTC (rev 14655)
+++ core/trunk/core/src/main/java/org/hibernate/event/def/DefaultMergeEvent=
Listener.java	2008-05-09 23:23:29 UTC (rev 14656)
@@ -1,24 +1,28 @@
-//$Id: DefaultMergeEventListener.java 10784 2006-11-11 05:13:01Z steve.ebe=
rsole(a)jboss.com $
+//$Id: DefaultMergeEventListener.java 14513 2008-04-17 23:05:11Z gbadner $
 package org.hibernate.event.def;
 =

 import java.io.Serializable;
+import java.util.Iterator;
 import java.util.Map;
 =

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.ObjectDeletedException;
 import org.hibernate.StaleObjectStateException;
+import org.hibernate.TransientObjectException;
 import org.hibernate.WrongClassException;
 import org.hibernate.engine.Cascade;
 import org.hibernate.engine.CascadingAction;
+import org.hibernate.engine.EntityEntry;
+import org.hibernate.engine.EntityKey;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.engine.Status;
 import org.hibernate.event.EventSource;
 import org.hibernate.event.MergeEvent;
 import org.hibernate.event.MergeEventListener;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.engine.EntityEntry;
-import org.hibernate.engine.EntityKey;
 import org.hibernate.intercept.FieldInterceptionHelper;
 import org.hibernate.intercept.FieldInterceptor;
 import org.hibernate.persister.entity.EntityPersister;
@@ -43,14 +47,33 @@
 		return IdentityMap.invert( (Map) anything );
 	}
 =

-	/** =

+	/**
 	 * Handle the given merge event.
 	 *
 	 * @param event The merge event to be handled.
 	 * @throws HibernateException
 	 */
 	public void onMerge(MergeEvent event) throws HibernateException {
-		onMerge( event, IdentityMap.instantiate(10) );
+		Map copyCache =3D IdentityMap.instantiate(10);
+		onMerge( event, copyCache );
+		for ( Iterator it=3DcopyCache.values().iterator(); it.hasNext(); ) {
+			Object entity =3D it.next();
+			if ( entity instanceof HibernateProxy ) {
+				entity =3D ( (HibernateProxy) entity ).getHibernateLazyInitializer().g=
etImplementation();
+			}
+			EntityEntry entry =3D event.getSession().getPersistenceContext().getEnt=
ry( entity );
+			if ( entry =3D=3D null ) {
+				throw new TransientObjectException(
+						"object references an unsaved transient instance - save the transien=
t instance before merging: " +
+						event.getSession().guessEntityName( entity )
+				);
+				// TODO: cache the entity name somewhere so that it is available to th=
is exception
+				// entity name will not be available for non-POJO entities
+			}
+			if ( entry.getStatus() !=3D Status.MANAGED ) {
+				throw new AssertionFailure( "Merged entity does not have status set to=
 MANAGED; "+entry+" status=3D"+entry.getStatus() );
+			}
+		}
 	}
 =

 	/** =

@@ -82,14 +105,13 @@
 				entity =3D original;
 			}
 			=

-			if ( copyCache.containsKey(entity) ) {
+			if ( copyCache.containsKey(entity) &&
+					source.getContextEntityIdentifier( copyCache.get( entity ) ) !=3D nul=
l ) {
 				log.trace("already merged");
 				event.setResult(entity);
 			}
 			else {
-
 				event.setEntity( entity );
-
 				int entityState =3D -1;
 =

 				// Check the persistence context for an entry relating to this
@@ -116,7 +138,7 @@
 				if ( entityState =3D=3D -1 ) {
 					entityState =3D getEntityState( entity, event.getEntityName(), entry,=
 source );
 				}
-
+				=

 				switch (entityState) {
 					case DETACHED:
 						entityIsDetached(event, copyCache);
@@ -128,7 +150,7 @@
 						entityIsPersistent(event, copyCache);
 						break;
 					default: //DELETED
-						throw new ObjectDeletedException( =

+						throw new ObjectDeletedException(
 								"deleted instance passed to merge", =

 								null, =

 								getLoggableName( event.getEntityName(), entity )
@@ -170,11 +192,16 @@
 		final Serializable id =3D persister.hasIdentifierProperty() ?
 				persister.getIdentifier( entity, source.getEntityMode() ) :
 		        null;
+		if ( copyCache.containsKey( entity ) ) {
+			persister.setIdentifier( copyCache.get( entity ), id, source.getEntityM=
ode() );
+		}
+		else {
+			copyCache.put(entity, persister.instantiate( id, source.getEntityMode()=
 ) ); //before cascade!
+			//TODO: should this be Session.instantiate(Persister, ...)?
+		}
+		final Object copy =3D copyCache.get( entity );
 =

-		final Object copy =3D persister.instantiate( id, source.getEntityMode() =
);  //TODO: should this be Session.instantiate(Persister, ...)?
-		copyCache.put(entity, copy); //before cascade!
-		=

-		// cascade first, so that all unsaved objects get their =

+		// cascade first, so that all unsaved objects get their
 		// copy created before we actually copy
 		//cascadeOnMerge(event, persister, entity, copyCache, Cascades.CASCADE_B=
EFORE_MERGE);
 		super.cascadeBeforeSave(source, persister, entity, copyCache);
@@ -330,7 +357,7 @@
 			return entry.isExistsInDatabase();
 		}
 	}
-
+	=

 	protected void copyValues(
 		final EntityPersister persister, =

 		final Object entity, =

@@ -353,8 +380,8 @@
 =

 	protected void copyValues(
 			final EntityPersister persister,
-			final Object entity,
-			final Object target,
+			final Object entity, =

+			final Object target, =

 			final SessionImplementor source,
 			final Map copyCache,
 			final ForeignKeyDirection foreignKeyDirection) {

Modified: core/trunk/core/src/main/java/org/hibernate/type/EntityType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/type/EntityType.java	2008-0=
5-09 17:07:31 UTC (rev 14655)
+++ core/trunk/core/src/main/java/org/hibernate/type/EntityType.java	2008-0=
5-09 23:23:29 UTC (rev 14656)
@@ -1,4 +1,4 @@
-//$Id: EntityType.java 10777 2006-11-08 22:02:28Z steve.ebersole(a)jboss.c=
om $
+//$Id: EntityType.java 14513 2008-04-17 23:05:11Z gbadner $
 package org.hibernate.type;
 =

 import java.io.Serializable;
@@ -250,13 +250,23 @@
 			if ( original =3D=3D target ) {
 				return target;
 			}
-			Object id =3D getIdentifier( original, session );
-			if ( id =3D=3D null ) {
-				throw new AssertionFailure("cannot copy a reference to an object with =
a null id");
+			if ( session.getContextEntityIdentifier( original ) =3D=3D null  &&
+					ForeignKeys.isTransient( associatedEntityName, original, Boolean.FALS=
E, session ) ) {
+				final Object copy =3D session.getFactory().getEntityPersister( associa=
tedEntityName )
+						.instantiate( null, session.getEntityMode() );
+				//TODO: should this be Session.instantiate(Persister, ...)?
+				copyCache.put( original, copy );
+				return copy;
 			}
-			id =3D getIdentifierOrUniqueKeyType( session.getFactory() )
-					.replace(id, null, session, owner, copyCache);
-			return resolve( id, session, owner );
+			else {
+				Object id =3D getIdentifier( original, session );
+				if ( id =3D=3D null ) {
+					throw new AssertionFailure("non-transient entity has a null id");
+				}
+				id =3D getIdentifierOrUniqueKeyType( session.getFactory() )
+						.replace(id, null, session, owner, copyCache);
+				return resolve( id, session, owner );
+			}
 		}
 	}
 =

@@ -451,7 +461,7 @@
 		if ( value =3D=3D null ) {
 			return "null";
 		}
-
+		=

 		EntityPersister persister =3D factory.getEntityPersister( associatedEnti=
tyName );
 		StringBuffer result =3D new StringBuffer().append( associatedEntityName =
);
 =

@@ -467,11 +477,11 @@
 			else {
 				id =3D getIdentifier( value, persister, entityMode );
 			}
-
+			=

 			result.append( '#' )
 				.append( persister.getIdentifierType().toLoggableString( id, factory )=
 );
 		}
-
+		=

 		return result.toString();
 	}
 =

@@ -537,7 +547,7 @@
 			return uniqueKeyPropertyName;
 		}
 	}
-
+	=

 	protected abstract boolean isNullable();
 =

 	/**
@@ -584,9 +594,9 @@
 	 * @throws HibernateException generally indicates problems performing the=
 load.
 	 */
 	public Object loadByUniqueKey(
-			String entityName,
-			String uniqueKeyPropertyName,
-			Object key,
+			String entityName, =

+			String uniqueKeyPropertyName, =

+			Object key, =

 			SessionImplementor session) throws HibernateException {
 		final SessionFactoryImplementor factory =3D session.getFactory();
 		UniqueKeyLoadable persister =3D ( UniqueKeyLoadable ) factory.getEntityP=
ersister( entityName );
@@ -594,11 +604,11 @@
 		//TODO: implement caching?! proxies?!
 =

 		EntityUniqueKey euk =3D new EntityUniqueKey(
-				entityName,
-				uniqueKeyPropertyName,
-				key,
+				entityName, =

+				uniqueKeyPropertyName, =

+				key, =

 				getIdentifierOrUniqueKeyType( factory ),
-				session.getEntityMode(),
+				session.getEntityMode(), =

 				session.getFactory()
 		);
 =


Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/A.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/A.java	  =
                      (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/A.java	20=
08-05-09 23:23:29 UTC (rev 14656)
@@ -0,0 +1,106 @@
+// $Id$
+
+package org.hibernate.test.cascade;
+
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author <a href=3D"mailto:ovidiu(a)feodorov.com">Ovidiu Feodorov</a>
+ *
+ * Copyright 2008 Ovidiu Feodorov
+ *
+ */
+public class A
+{
+    // Constants ---------------------------------------------------------=
--------------------------
+
+    // Static ------------------------------------------------------------=
--------------------------
+
+    // Attributes --------------------------------------------------------=
--------------------------
+
+    private long id;
+
+    private String data;
+
+    // A 1 - * H
+    private Set hs;
+
+    // A 1 - 1 G
+    private G g;
+
+
+    // Constructors ------------------------------------------------------=
--------------------------
+
+    public A()
+    {
+        hs =3D new HashSet();
+    }
+
+    public A(String data)
+    {
+        this();
+        this.data =3D data;
+    }
+
+    // Public ------------------------------------------------------------=
--------------------------
+
+    public long getId()
+    {
+        return id;
+    }
+
+    public void setId(long id)
+    {
+        this.id =3D id;
+    }
+
+    public void setData(String data)
+    {
+        this.data =3D data;
+    }
+
+    public String getData()
+    {
+        return data;
+    }
+
+    public void setHs(Set hs)
+    {
+        this.hs =3D hs;
+    }
+
+    public Set getHs()
+    {
+        return hs;
+    }
+
+    public void setG(G g)
+    {
+        this.g =3D g;
+    }
+
+    public G getG()
+    {
+        return g;
+    }
+
+    public void addH(H h)
+    {
+        hs.add(h);
+        h.setA(this);
+    }
+
+    public String toString()
+    {
+        return "A[" + id + ", " + data + "]";
+    }
+
+    // Package protected -------------------------------------------------=
--------------------------
+
+    // Protected ---------------------------------------------------------=
--------------------------
+
+    // Private -----------------------------------------------------------=
--------------------------
+
+    // Inner classes -----------------------------------------------------=
--------------------------
+}


Property changes on: core/trunk/testsuite/src/test/java/org/hibernate/test/=
cascade/A.java
___________________________________________________________________
Name: svn:executable
   + *

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/Cas=
cadeSuite.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/CascadeSu=
ite.java	2008-05-09 17:07:31 UTC (rev 14655)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/CascadeSu=
ite.java	2008-05-09 23:23:29 UTC (rev 14656)
@@ -12,6 +12,7 @@
 		TestSuite suite =3D new TestSuite( "Cascade tests" );
 		suite.addTest( BidirectionalOneToManyCascadeTest.suite() );
 		suite.addTest( RefreshTest.suite() );
+		suite.addTest( MultiPathCascadeTest.suite() );
 		return suite;
 	}
 }

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/G.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/G.java	  =
                      (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/G.java	20=
08-05-09 23:23:29 UTC (rev 14656)
@@ -0,0 +1,95 @@
+package org.hibernate.test.cascade;
+
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author <a href=3D"mailto:ovidiu(a)feodorov.com">Ovidiu Feodorov</a>
+ *
+ * Copyright 2008 Ovidiu Feodorov
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public class G
+{
+    // Constants ---------------------------------------------------------=
--------------------------
+
+    // Static ------------------------------------------------------------=
--------------------------
+
+    // Attributes --------------------------------------------------------=
--------------------------
+
+    private long id;
+
+    private String data;
+
+    // A 1 <-> 1 G
+    private A a;
+
+    // G * <-> * H
+    private Set hs;
+
+    // Constructors ------------------------------------------------------=
--------------------------
+
+    public G()
+    {
+        this(null);
+    }
+
+    public G(String data)
+    {
+        this.data =3D data;
+        hs =3D new HashSet();
+    }
+
+    // Public ------------------------------------------------------------=
--------------------------
+
+    public String getData()
+    {
+        return data;
+    }
+
+    public void setData(String data)
+    {
+        this.data =3D data;
+    }
+
+    public A getA()
+    {
+        return a;
+    }
+
+    public void setA(A a)
+    {
+        this.a =3D a;
+    }
+
+    public Set getHs()
+    {
+        return hs;
+    }
+
+    public void setHs(Set s)
+    {
+        hs =3D s;
+    }
+
+    // Package protected -------------------------------------------------=
--------------------------
+
+    long getId()
+    {
+        return id;
+    }
+
+    // Protected ---------------------------------------------------------=
--------------------------
+
+    // Private -----------------------------------------------------------=
--------------------------
+
+    private void setId(long id)
+    {
+        this.id =3D id;
+    }
+
+    // Inner classes -----------------------------------------------------=
--------------------------
+}


Property changes on: core/trunk/testsuite/src/test/java/org/hibernate/test/=
cascade/G.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/H.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/H.java	  =
                      (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/H.java	20=
08-05-09 23:23:29 UTC (rev 14656)
@@ -0,0 +1,94 @@
+// $Id$
+
+
+package org.hibernate.test.cascade;
+
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author <a href=3D"mailto:ovidiu(a)feodorov.com">Ovidiu Feodorov</a>
+ *
+ * Copyright 2008 Ovidiu Feodorov
+ *
+ */
+public class H
+{
+    // Constants ---------------------------------------------------------=
--------------------------
+
+    // Static ------------------------------------------------------------=
--------------------------
+
+    // Attributes --------------------------------------------------------=
--------------------------
+
+    private long id;
+
+    private String data;
+
+    private A a;
+
+    // G * <-> * H
+    private Set gs;
+
+    // Constructors ------------------------------------------------------=
--------------------------
+
+    public H()
+    {
+        this(null);
+    }
+
+    public H(String data)
+    {
+        this.data =3D data;
+        gs =3D new HashSet();
+    }
+
+    // Public ------------------------------------------------------------=
--------------------------
+
+    public long getId()
+    {
+        return id;
+    }
+
+    public String getData()
+    {
+        return data;
+    }
+
+    public void setData(String data)
+    {
+        this.data =3D data;
+    }
+
+    public A getA()
+    {
+        return a;
+    }
+
+    public void setA(A a)
+    {
+        this.a =3D a;
+    }
+
+    public Set getGs()
+    {
+        return gs;
+    }
+
+    public void setGs(Set gs)
+    {
+        this.gs =3D gs;
+    }
+
+    // Package protected -------------------------------------------------=
--------------------------
+
+    // Protected ---------------------------------------------------------=
--------------------------
+
+    // Private -----------------------------------------------------------=
--------------------------
+
+    private void setId(long id)
+    {
+        this.id =3D id;
+    }
+
+    // Inner classes -----------------------------------------------------=
--------------------------
+}


Property changes on: core/trunk/testsuite/src/test/java/org/hibernate/test/=
cascade/H.java
___________________________________________________________________
Name: svn:executable
   + *

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiP=
athCascade.hbm.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPath=
Cascade.hbm.xml	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPath=
Cascade.hbm.xml	2008-05-09 23:23:29 UTC (rev 14656)
@@ -0,0 +1,67 @@
+<?xml version=3D"1.0"?>
+<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hiber=
nate-mapping-3.0.dtd" >
+
+<hibernate-mapping package=3D"org.hibernate.test.cascade">
+
+    <class name=3D"A" table=3D"HB_A">
+
+        <id name=3D"id" type=3D"long"><generator class=3D"native"/></id>
+
+        <property name=3D"data" type=3D"string" not-null=3D"true"/>
+
+        <!--
+             Associations
+        -->
+
+        <set name=3D"hs" inverse=3D"true" cascade=3D"all">
+            <key column=3D"a_fk"/>
+            <one-to-many class=3D"H"/>
+        </set>
+        <one-to-one name=3D"g" class=3D"G" property-ref=3D"a" cascade=3D"a=
ll"/>
+
+    </class>
+
+    <class name=3D"G" table=3D"HB_G">
+
+        <id name=3D"id" type=3D"long"><generator class=3D"native"/></id>
+
+        <property name=3D"data" type=3D"string" not-null=3D"true"/>
+
+        <!--
+             Associations
+        -->
+
+        <set name=3D"hs" inverse=3D"true" table=3D"HB_G_H" cascade=3D"all">
+            <key column=3D"g_fk"/>
+            <many-to-many class=3D"H" column=3D"h_fk"/>
+        </set>
+
+        <many-to-one name=3D"a"
+            column=3D"aId"
+            unique=3D"true"
+            not-null=3D"false"/>
+
+    </class>
+
+    <class name=3D"H" table=3D"HB_H">
+
+        <id name=3D"id" type=3D"long"><generator class=3D"native"/></id>
+
+        <property name=3D"data" type=3D"string" not-null=3D"true"/>
+
+        <!--
+            Associations
+        -->
+
+        <!-- *NOT* cascaded -->
+        <set name=3D"gs" table=3D"HB_G_H">
+            <key column=3D"h_fk"/>
+            <many-to-many class=3D"G" column=3D"g_fk"/>
+        </set>
+
+        <many-to-one name=3D"a" column=3D"a_fk" class=3D"A"/>
+
+    </class>
+
+
+</hibernate-mapping>
\ No newline at end of file

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiP=
athCascadeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPath=
CascadeTest.java	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPath=
CascadeTest.java	2008-05-09 23:23:29 UTC (rev 14656)
@@ -0,0 +1,337 @@
+//$Id: $
+
+package org.hibernate.test.cascade;
+
+import junit.framework.Test;
+
+import org.hibernate.Session;
+import org.hibernate.TransientObjectException;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.proxy.HibernateProxy;
+
+/**
+ * @author <a href=3D"mailto:ovidiu(a)feodorov.com">Ovidiu Feodorov</a>
+ * @author Gail Badner
+ *
+ */
+
+public class MultiPathCascadeTest extends FunctionalTestCase {
+
+	public MultiPathCascadeTest(String name) {
+		super( name );
+	}
+
+	public String[] getMappings() {
+		return new String[] {
+				"cascade/MultiPathCascade.hbm.xml"
+		};
+	}
+
+	public static Test suite() {
+		return new FunctionalTestClassTestSuite( MultiPathCascadeTest.class );
+	}
+
+	protected void cleanupTest() {
+		Session s =3D openSession();
+		s.beginTransaction();
+		s.createQuery( "delete from A" );
+		s.createQuery( "delete from G" );
+		s.createQuery( "delete from H" );
+	}
+
+	public void testMultiPathMergeModifiedDetached() throws Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		a =3D ( A ) s.merge( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+	}
+
+	public void testMultiPathMergeModifiedDetachedIntoProxy() throws Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		A aLoaded =3D ( A ) s.load( A.class, new Long( a.getId() ) );
+		assertTrue( aLoaded instanceof HibernateProxy );
+		assertSame( aLoaded, s.merge( a ) );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+	}
+
+	public void testMultiPathUpdateModifiedDetached() throws Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		s.update( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+	}
+
+	public void testMultiPathGetAndModify() throws Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		s =3D openSession();
+		s.beginTransaction();
+		// retrieve the previously saved instance from the database, and update =
it
+		a =3D ( A ) s.get( A.class, new Long( a.getId() ) );
+		modifyEntity( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+	}
+
+	public void testMultiPathMergeNonCascadedTransientEntityInCollection() th=
rows Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		a =3D ( A ) s.merge( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+
+		// add a new (transient) G to collection in h
+		// there is no cascade from H to the collection, so this should fail whe=
n merged
+		assertEquals( 1, a.getHs().size() );
+		H h =3D ( H ) a.getHs().iterator().next();
+		G gNew =3D new G();
+		gNew.setData( "Gail" );
+		gNew.getHs().add( h );
+		h.getGs().add( gNew );
+
+		s =3D openSession();
+		s.beginTransaction();
+		try {
+			s.merge( a );
+			s.merge( h );
+			fail( "should have thrown TransientObjectException" );
+		}
+		catch ( TransientObjectException ex ) {
+			// expected
+		}
+		finally {
+			s.getTransaction().rollback();
+		}
+		s.close();
+	}
+
+	public void testMultiPathMergeNonCascadedTransientEntityInOneToOne() thro=
ws Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		a =3D ( A ) s.merge( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+
+		// change the one-to-one association from g to be a new (transient) A
+		// there is no cascade from G to A, so this should fail when merged
+		G g =3D a.getG();
+		a.setG( null );
+		A aNew =3D new A();
+		aNew.setData( "Alice" );
+		g.setA( aNew );
+		aNew.setG( g );
+
+		s =3D openSession();
+		s.beginTransaction();
+		try {
+			s.merge( a );
+			s.merge( g );
+			fail( "should have thrown TransientObjectException" );
+		}
+		catch ( TransientObjectException ex ) {
+			// expected
+		}
+		finally {
+			s.getTransaction().rollback();
+		}
+		s.close();
+	}
+
+	public void testMultiPathMergeNonCascadedTransientEntityInManyToOne() thr=
ows Exception
+	{
+		// persist a simple A in the database
+
+		Session s =3D openSession();
+		s.beginTransaction();
+		A a =3D new A();
+		a.setData( "Anna" );
+		s.save( a );
+		s.getTransaction().commit();
+		s.close();
+
+		// modify detached entity
+		modifyEntity( a );
+
+		s =3D openSession();
+		s.beginTransaction();
+		a =3D ( A ) s.merge( a );
+		s.getTransaction().commit();
+		s.close();
+
+		verifyModifications( a.getId() );
+
+		// change the many-to-one association from h to be a new (transient) A
+		// there is no cascade from H to A, so this should fail when merged
+		assertEquals( 1, a.getHs().size() );
+		H h =3D ( H ) a.getHs().iterator().next();
+		a.getHs().remove( h );
+		A aNew =3D new A();
+		aNew.setData( "Alice" );
+		aNew.addH( h );
+
+		s =3D openSession();
+		s.beginTransaction();
+		try {
+			s.merge( a );
+			s.merge( h );
+			fail( "should have thrown TransientObjectException" );
+		}
+		catch ( TransientObjectException ex ) {
+			// expected
+		}
+		finally {
+			s.getTransaction().rollback();
+		}
+		s.close();
+	}
+
+	private void modifyEntity(A a) {
+		// create a *circular* graph in detached entity
+		a.setData("Anthony");
+
+		G g =3D new G();
+		g.setData( "Giovanni" );
+
+		H h =3D new H();
+		h.setData( "Hellen" );
+
+		a.setG( g );
+		g.setA( a );
+
+		a.getHs().add( h );
+		h.setA( a );
+
+		g.getHs().add( h );
+		h.getGs().add( g );
+	}
+
+	private void verifyModifications(long aId) {
+		Session s =3D openSession();
+		s.beginTransaction();
+
+		// retrieve the A object and check it
+		A a =3D ( A ) s.get( A.class, new Long( aId ) );
+		assertEquals( aId, a.getId() );
+		assertEquals( "Anthony", a.getData() );
+		assertNotNull( a.getG() );
+		assertNotNull( a.getHs() );
+		assertEquals( 1, a.getHs().size() );
+
+		G gFromA =3D a.getG();
+		H hFromA =3D ( H ) a.getHs().iterator().next();
+
+		// check the G object
+		assertEquals( "Giovanni", gFromA.getData() );
+		assertSame( a, gFromA.getA() );
+		assertNotNull( gFromA.getHs() );
+		assertEquals( a.getHs(), gFromA.getHs() );
+		assertSame( hFromA, gFromA.getHs().iterator().next() );
+
+		// check the H object
+		assertEquals( "Hellen", hFromA.getData() );
+		assertSame( a, hFromA.getA() );
+		assertNotNull( hFromA.getGs() );
+		assertEquals( 1, hFromA.getGs().size() );
+		assertSame( gFromA, hFromA.getGs().iterator().next() );
+
+		s.getTransaction().commit();
+		s.close();
+	}
+
+}


--===============6381258290745872795==--

From hibernate-commits at lists.jboss.org Sat May 10 18:58:25 2008
Content-Type: multipart/mixed; boundary="===============2846438587696263577=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14657 -
 core/trunk/core/src/main/java/org/hibernate/jdbc/util.
Date: Sat, 10 May 2008 18:58:25 -0400
Message-ID: <E1Juy1J-0006OR-EZ@committer01.frg.pub.inap.atl.jboss.com>

--===============2846438587696263577==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: d.plentz
Date: 2008-05-10 18:58:25 -0400 (Sat, 10 May 2008)
New Revision: 14657

Modified:
   core/trunk/core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImpl=
.java
Log:
[HHH-3272] using of Integer.valueOf(int), which is not available in JDK 1.4

Modified: core/trunk/core/src/main/java/org/hibernate/jdbc/util/BasicFormat=
terImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImp=
l.java	2008-05-09 23:23:29 UTC (rev 14656)
+++ core/trunk/core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImp=
l.java	2008-05-10 22:58:25 UTC (rev 14657)
@@ -268,7 +268,7 @@
 			out();
 			indent++;
 			newline();
-			parenCounts.addLast( Integer.valueOf( parensSinceSelect ) );
+			parenCounts.addLast( new Integer( parensSinceSelect ) );
 			afterByOrFromOrSelects.addLast( Boolean.valueOf( afterByOrSetOrFromOrSe=
lect ) );
 			parensSinceSelect =3D 0;
 			afterByOrSetOrFromOrSelect =3D true;


--===============2846438587696263577==--

From hibernate-commits at lists.jboss.org Mon May 12 16:14:57 2008
Content-Type: multipart/mixed; boundary="===============4666267670949239427=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14658 -
 core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US.
Date: Mon, 12 May 2008 16:14:57 -0400
Message-ID: <E1JveQD-0005tr-Fa@committer01.frg.pub.inap.atl.jboss.com>

--===============4666267670949239427==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bsatguna
Date: 2008-05-12 16:14:57 -0400 (Mon, 12 May 2008)
New Revision: 14658

Added:
   core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-=
US/Release_Notes.ent
Removed:
   core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-=
US/Book_Info.xml
Modified:
   core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-=
US/Article_Info.xml
   core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-=
US/Release_Notes.xml
Log:
updated content to reflect latest changes in redhat svn: release notes for =
3.2.4.sp01.cp03

Modified: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docb=
ook/en-US/Article_Info.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Article_Info.xml	2008-05-10 22:58:25 UTC (rev 14657)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Article_Info.xml	2008-05-12 20:14:57 UTC (rev 14658)
@@ -2,12 +2,12 @@
 <!DOCTYPE articleinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://=
www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 =

-<articleinfo id=3D"Release_Notes-Hibernate-Standalone">
-	<title>Enterprise Hibernate x.y.z Release Notes</title>
+<articleinfo id=3D"Release_Notes-Hibernate">
+	<title>Hibernate</title>
 	<subtitle>Release Notes</subtitle>
-	<issuenum>0.1</issuenum>
-	<productnumber>0</productnumber>
-	<abstract><para>This document outlines information necessary for installa=
tion, migration and bug fixes.</para>
+	<issuenum>3.2.4</issuenum>
+	<productnumber>0.1</productnumber>
+	<abstract><para>This document contains release notes for new and existing=
 users of Hibernate regarding Hibernate &VERSION; release. It provides inst=
allation and migration notes, document sources and bug fixes for this relea=
se.</para>
 	</abstract>
 	<corpauthor><inlinemediaobject>
 			<imageobject>

Deleted: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbo=
ok/en-US/Book_Info.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Book_Info.xml	2008-05-10 22:58:25 UTC (rev 14657)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Book_Info.xml	2008-05-12 20:14:57 UTC (rev 14658)
@@ -1,27 +0,0 @@
-<?xml version=3D'1.0'?>
-<!DOCTYPE articleinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://=
www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
-<articleinfo id=3D"Release_Notes-Product_Name_and_Version">
-	<title>Product Name and Version</title>
-	<subtitle>Release Notes</subtitle>
-	<issuenum>0.1</issuenum>
-	<productnumber>0</productnumber>
-	<abstract><para>This book is about... (Be brief; this para is used for th=
e RPM spec
-			file)</para>
-	</abstract>
-	<corpauthor><inlinemediaobject>
-			<imageobject>
-				<imagedata fileref=3D"Common_Content/images/redhat-logo.svg" />
-			</imageobject>
-		</inlinemediaobject>
-	</corpauthor><copyright>
-		<year>&YEAR;</year>
-		<holder>&HOLDER;</holder>
-	</copyright>
-	<xi:include href=3D"Common_Content/Legal_Notice.xml" xmlns:xi=3D"http://w=
ww.w3.org/2001/XInclude" />
-	<xi:include href=3D"Author_Group.xml" xmlns:xi=3D"http://www.w3.org/2001/=
XInclude" />
-</articleinfo>
-
-
-

Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook=
/en-US/Release_Notes.ent
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Release_Notes.ent	                        (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Release_Notes.ent	2008-05-12 20:14:57 UTC (rev 14658)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "Hibernate Standalone">
+<!ENTITY BOOKID "Release Notes">
+<!ENTITY VERSION "3.2.4.sp01.cp03 version">
+<!ENTITY YEAR "2008">

Modified: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docb=
ook/en-US/Release_Notes.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Release_Notes.xml	2008-05-10 22:58:25 UTC (rev 14657)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en=
-US/Release_Notes.xml	2008-05-12 20:14:57 UTC (rev 14658)
@@ -8,63 +8,396 @@
 			Overview
 		</title>
 		<para>
-			These release notes contain important information regarding Hibernate &=
VERSION;. This document covers installation and migration notes, new featur=
es and bug fixes. =

+			These release notes contain important information regarding Hibernate &=
VERSION; release. This document lists the necessary software that must be i=
nstalled before using Hibernate. Users of previous versions of Hibernate ma=
y refer to <xref linkend=3D"Fixed_Issues"/> to find the latest JIRA issue f=
ixes. In addition, the latest <xref linkend=3D"Documentation"/>, product su=
pport and license links are also provided.  =

 		</para>
 	=

 		<section id=3D"Background">
 			<title>Background</title>
 			<para>
-				Hibernate is a powerful object/relational mapping tool for building Ja=
va applications. It significantly reduces repetitive persistence related pr=
ogramming tasks by mapping the object model's data representation to a rela=
tional data model. Hibernate offers a sophisticated object-oriented HQL (Hi=
bernate query language) allowing the programmer to make use of polymorphic =
queries. Queries can be expressed in native SQL or using Criteria and examp=
le queries. A full feature datasheet is available <ulink url=3D"http://www.=
jboss.com/pdf/HibernateBrochure-Jun2005.pdf">here for download</ulink> 			=

+				Hibernate is a powerful object/relational mapping tool and a query ser=
vice for building Java applications. Hibernate offers a sophisticated objec=
t-oriented HQL (Hibernate query language) allowing the programmer to make u=
se of polymorphic queries. Queries can be expressed in native SQL or using =
Java-based Criteria and Example queries. A full feature datasheet is availa=
ble <ulink url=3D"http://www.jboss.com/pdf/HibernateBrochure-Jun2005.pdf">h=
ere</ulink> for download.
 			</para>
+			<para>
+				Hibernate can be integrated with any Java EE middleware platform. This=
 release is also embedded in JBoss Enterprise Application platform versions=
 4.2 CP 03 and 4.3 CP 01 releases. Hence, the <filename>jar</filename> file=
s remain the same as the ones distributed with JBoss Enterprise Application=
 Platform 4.2 CP 03 and 4.3 CP 01 releases.  =

+			</para>
+			<para>
+				This Hibernate version is available through subscriptions which offers=
 certified software, industry-leading support, updates and patches, documen=
tation, and multi-year maintenance policies.
+			</para>
 		</section>
 	</section>
 	<section id=3D"Important_Notes">
 		<title>Installation And Migration Guide</title>
 		<para>
-			This section contains all information related to installing hibernate, =
testing the installation and running some examples.
+			This section lists the software that must be installed on your local ma=
chine before beginning to use Hibernate. Migration notes are also listed in=
 this section for users who will be using existing databases along with Hib=
ernate.
 		</para>
+		=

+		<section id=3D"Prerequisites">
+			<title>Prerequisites</title>
+			<para>
+				The software required for setting up Hibernate for use will depend on =
whether you would also like to build and test the Hibernate source files or=
 use the <filename>jar</filename> files directly. =

+			</para>		=

+			<section id=3D"Using_Hibernate">
+				<title>Using Hibernate</title>
+				<para><application>JDK 1.5</application></para>
+				<para>
+					To build Java applications with Hibernate you must have <application>=
JDK</application> 1.5 version installed. While this version is compatible w=
ith Hibernate, version 1.4 is no longer supported. You must ensure that aft=
er installation, the environment variables are set for use. =

+				</para>
+		=

+			</section>
+			=

+			<section id=3D"Testing_Hibernate_And_Running_Demo">
+				<title>Testing Hibernate and Running the demo</title>
+				<para>
+					To test Hibernate and run the demo, you will need <application>Apache=
 Ant 1.7.0</application> and <application>JUnit 3.8.1</application>. 	=

+				</para>
+				=

+				<itemizedlist>	=

+					<listitem>
+						<para><application>Apache Ant 1.7.0</application></para>
+						<para>Apache Ant can be downloaded from this <ulink url=3D"http://an=
t.apache.org">link</ulink>. You must set the <property>ANT_HOME</property> =
environment variable to point to the Apache Ant install location. You may r=
efer to the manual available on their website for installing and setting up=
 Apache Ant for use. </para>
+					</listitem>
+					<listitem>
+						<para><application>JUnit 3.8.1</application></para>
+						<para>
+							To run JUnit tests, you may use JUnit 3.8.1 version which can be do=
wnloaded from <ulink url=3D"http://www.junit.org/">here</ulink>. After inst=
allation, copy <filename>junit.jar</filename> to <literal>$ANT_HOME/lib</li=
teral> directory. Documentation to help you get started on running sample t=
est cases are available on their website. <xref linkend=3D"Running_JUnit_Te=
sts"/> provides further notes on running JUnit tests.  =

+						</para>
+	=

+					</listitem>					=

+				</itemizedlist>
+				=

+				=

+			</section>		=

+		</section>
+		=

 		<section id=3D"Installation_Notes">
 			<title>Installation Notes</title>
 			<para>
-				We advise users to ensure that adequate disk space is available for th=
e installation of Hibernate, JDK 1.4 (or above) and the database. =

-
+				Extract files from the Hibernate <literal>ZIP</literal> file to the de=
sired location. Open the directory where you have extracted these files. To=
 use Hibernate, you must configure the project's classpath settings to poin=
t to the <filename>jar</filename> files. Settings for individual IDEs diffe=
r, but normally you would add the <filename>jar</filename> files as externa=
l library files.  =

 			</para>
+			<section id=3D"Hibernate_Dependencies">
+				<title>Hibernate Dependencies</title>
+				<para>
+					The lib directory contains all the dependencies required to use Hiber=
nate in a supported fashion.  Certain dependencies from the community build=
s (such as connection pool integration and second-level cache providers oth=
er than the JBoss Cache provider) are not included as they are not supporte=
d.
+				</para>
+			</section>
+				=

 		</section>
-		<section id=3D"Migration_Guide">
-			<title>Migration Guide</title>
-			<para>
-				Information regarding upgrades  =

-			</para>
+		<section id=3D"Migration_Notes">
+			<title>Migration Notes</title>
+			<section id=3D"Configuring_Database">
+				<title>Configuring your database</title>
+				<para>
+					To use your database with Hibernate, copy your <literal>JDBC</literal=
> driver into the <literal>lib</literal> directory. Then edit the <filename=
>hibernate.properties</filename> file in the <literal>etc</literal> directo=
ry. Additional configuration notes are available in <citetitle pubwork=3D"b=
ook">Hibernate Reference Guide</citetitle>, chapter 3: Configuration. The H=
ibernate supported databases are: Oracle9i, Oracle10g, MS SQL 2005, Postgre=
SQL and MySQL.
+				</para>
+				<section id=3D"Oracle_Users">
+					<title>Oracle users</title>
+					<para>
+						OracleDialect and Oracle9Dialect have been deprecated. Oracle8iDiale=
ct, Oracle9iDialect, or Oracle10gDialect should be used instead.  =

+					</para>
+				</section>
+			</section>
 		</section>
 	</section>
-	<section id=3D"Features_And_Bug_Fixes">
-		<title>New features and bug fixes</title>
+	=

+	<section id=3D"Certified_Configurations">
+		<title>Certified Configurations</title>		=

 		<para>
-			All new features and bug fixes mentioned in these release notes are app=
licable to VERSION;. =

+			Certified Configurations are a defined set of validated, tested, and re=
commended Operating Systems, chip architectures, JVM, and database combinat=
ions. These configurations have been tested and validated against the Hiber=
nate &VERSION; release.
 		</para>
-		<section id=3D"New_Features">
-			<title>New Features</title>
+		<table id=3D"T_CC">
+			<title>Compatible Operating systems, chip architecture and JVMs.</title>
+			<tgroup cols=3D"3">
+				<thead>
+					<row>
+						<entry>Operating System</entry>
+						<entry>Chip Architecture</entry>
+						<entry>Java Virtual Machine(s)</entry>
+					</row>
+				</thead>
+				<tbody>
+					<row>
+						<entry>Red Hat Enterprise Linux v5</entry>
+						<entry>x86, x86_64</entry>
+						<entry>Sun JDK 1.5.0_11, BEA JRockit JDK 1.5.0_08</entry>
+						=

+					</row>
+					<row>
+						<entry>Red Hat Enterprise Linux v4.5</entry>
+						<entry>x86, x86_64</entry>
+						<entry>Sun JDK 1.5.0_11, BEA JRockit JDK 1.5.0_08, Azul JDK 1.5.0_11=
</entry>
+						=

+						=

+					</row>
+					<row>
+						<entry>Microsoft Windows 2003</entry>
+						<entry>x86</entry>
+						<entry>Sun JDK 1.5.0_11, BEA JRockit JDK 1.5.0_10</entry>
+						=

+					</row>
+					<row>
+						<entry>Microsoft Windows 2003</entry>
+						<entry>x86_64</entry>
+						<entry>Sun JDK 1.5.0_11, BEA JRockit JDK 1.5.0_08</entry>
+						=

+					</row>
+					<row>
+						<entry>Solaris 10</entry>
+						<entry>x86, SPARC</entry>
+						<entry>Sun JDK 1.5.0_11</entry>
+					</row>
+					<row>
+						<entry>Solaris 9</entry>
+						<entry>SPARC</entry>
+						<entry>Sun JDK 1.5.0_11</entry>
+					</row>
+					<row>
+						<entry>HP-UX i2</entry>
+						<entry>RISC, ia64</entry>						=

+						<entry>HP-UX JDK 1.5.0.06</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+		=

+		<para>The following databases and database drivers were validated and ce=
rtified as part of the Hibernate &VERSION; release process:</para>
+		<table id=3D"T_DB">
+			<title>Compatible databases and database drivers</title>
+			<tgroup cols=3D"2">
+				<thead>
+					<row>
+						<entry>Database</entry>
+						<entry>Database Driver</entry>
+					</row>					=

+				</thead>
+				<tbody>
+					<row>
+						<entry>Oracle 10g R2</entry>
+						<entry>Oracle JDBC driver v10.2.0.1, Oracle JDBC driver v10.2.0.2</e=
ntry>
+					</row>
+					<row>
+						<entry>Oracle 9i</entry>
+						<entry>Oracle JDBC driver v10.2.0.1, Oracle JDBC driver v10.2.0.2</e=
ntry>
+					</row>
+					<row>
+						<entry>Microsoft SQL Server 2005</entry>
+						<entry>Microsoft SQL Server 2005 driver, v1.1.1501.101</entry>
+					</row>
+					<row>
+						<entry>MySQL v5.0</entry>
+						<entry>mysql-connector-java v5.0.4</entry>
+					</row>
+					<row>
+						<entry>PostgreSQL v8.1</entry>
+						<entry>PostgreSQL v8.2 JDBC3 with SSL (build 504)</entry>
+					</row>
+				</tbody>
+			</tgroup>
+		</table>
+	</section>
+	=

+	<section id=3D"Running_JUnit_Tests">
+		<title>Running JUnit Tests</title>
+		=

 			<para>
-				Provide a summary of new features applicable to this release. =

+				It is recommended that the Hibernate unit tests be executed using the =
same dialect and version of JDBC that will be used in production, to ensure=
 that the configuration setting, <property>hibernate.jdbc.batch_versioned_d=
ata</property>, is set properly. The value for  <property>hibernate.jdbc.ba=
tch_versioned_data</property> determines if Hibernate will use batches for =
updating versioned data (an optimization). =

 			</para>
-		</section>
-		<section id=3D"Bug_Fixes">
-			<title>Bug Fixes</title>
 			<para>
-				The following bugs have been addressed and resolved in this release.  =

+				Optimistic locking relies on the ability to obtain the number of rows =
updated. If the JDBC driver does not return update counts for each command =
in a batch, then <property>hibernate.jdbc.batch_versioned_data</property> s=
hould be set to "false". =

 			</para>
+			<para>
+				The unit tests use the settings in <filename>etc/hibernate.properties<=
/filename>. The value for <property>hibernate.jdbc.batch_versioned_data</pr=
operty> is set to <parameter>true</parameter> in that file. If the unit tes=
ts involving optimistic locking fail, then the appropriate value for this f=
lag is  <parameter>false</parameter>. Some versions of Oracle JDBC do not s=
upport returning update counts for each command in a batch, so it is partic=
ularly important to test using the same version of JDBC as will be used in =
production.
+			</para>
+		=

+		<section id=3D"Expected_JUnit_Failures_And_Tests">
+			<title>Expected failures and tests</title>
+			<para>
+				The following unit tests are expected to fail:
+			</para>
+			=

+				<formalpara>					=

+					<title>
+						Ehcache tests (Ehcache is not provided in this distribution):
+					</title>
+					<para>
+						org.hibernate.test.cache.ehcache.EhCacheTest.testQueryCacheInvalidat=
ion
+						org.hibernate.test.cache.ehcache.EhCacheTest.testEmptySecondLevelCac=
heEntry
+						org.hibernate.test.cache.ehcache.EhCacheTest.testStaleWritesLeaveCac=
heConsistent
+					</para>
+				</formalpara>
+				<formalpara>
+					<title>Expected unit test failure against MS SQL 2005</title>
+					<para>
+						org.hibernate.test.legacy.MasterDetailTest.testCachedCollectionRefre=
sh
+					</para>
+				</formalpara>
+				<formalpara>
+					<title>
+						"FailureExpected" tests (known issues to be addressed in the future)=
: =

+					</title>
+					<para>
+						org.hibernate.test.hql.ASTParserLoadingTest.testParameterTypeMismatc=
hFailureExpected
+						org.hibernate.test.hql.CriteriaHQLAlignmentTest.testCriteriaAggregat=
ionReturnTypeFailureExpected
+						org.hibernate.test.hql.HQLTest.testEmptyInListFailureExpected   =

+						org.hibernate.test.hql.HQLTest.testMaxindexHqlFuncttestMultipleEleme=
ntAccessorOperatorsFailureExpectedionInElementAccessorFailureExpected
+						org.hibernate.test.hql.HQLTest.testMultipleElementAccessorOperatorsF=
ailureExpected
+						org.hibernate.test.hql.HQLTest.testKeyManyToOneJoinFailureExpected
+						org.hibernate.test.hql.HQLTest.testDuplicateExplicitJoinFailureExpec=
ted
+						org.hibernate.test.keymanytoone.bidir.component.EagerKeyManyToOneTes=
t.testLoadEntityWithEagerFetchingToKeyManyToOneReferenceBackToSelfFailureEx=
pected
+						org.hibernate.test.legacy.SQLLoaderTest.testReturnPropertyComponentR=
enameFailureExpected
+						org.hibernate.test.readonly.ReadOnlyTest.testReadOnlyOnProxiesFailur=
eExpected
+						org.hibernate.test.sql.hand.query.NativeSQLQueriesTest.testComposite=
IdJoinsFailureExpected =

+					</para>
+				</formalpara>		=

 		</section>
 	</section>
-	<section id=3D"Documentation">
+	<section id=3D"Fixed_Issues" xreflabel=3D"fixed issues">
+		<title>Fixed Issues</title>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://jira.jboss.org/jira/browse/HIBERNATE-92">HIBERNAT=
E-92</ulink> - Update dependencies to be consistent with EAP 4.2 CP03
+			</title>
+			<para>
+				This release bundle has been made consistent with the Hibernate releas=
e embedded in JBoss EAP version 4.2 CP03. =

+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://jira.jboss.org/jira/browse/JBPAPP-357">JBPAPP-357=
 / HHH-2542</ulink> - <parameter>NullPointerException</parameter> in <prope=
rty>TypeFactory.replaceAssociations</property> for <property>ComponentType<=
/property> =

+			</title>
+			<para>
+				This bug which arises when a <literal>NULL</literal> value has been pa=
ssed into <property>ComponentType</property> object has been fixed.
+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://opensource.atlassian.com/projects/hibernate/brows=
e/HHH-1569">JBPAPP-740 / HHH-1569</ulink> - Immutable Natural Id can fail w=
ith ArrayIndexOutOfBounds in some cases
+			</title>
+			<para>
+				When the <property>natural-id</property> has been set with <parameter>=
mutable</parameter> as <parameter>false</parameter>, then it may cause <par=
ameter>ArrayIndexOutOfBounds</parameter> errors in some cases. This issue h=
as been resolved.
+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://opensource.atlassian.com/projects/hibernate/brows=
e/HHH-2631">JBPAPP-742 / HHH-2631</ulink> - Leaking <property>PreparedState=
ment</property> and <parameter>ResultSet</parameter> via <property>Collecti=
onLoadContext</property> instances maintained in Map <property>collectionLo=
adContexts</property> in <property>LoadContexts</property>
+			</title>
+			<para>
+				The number of <property>PreparedStatement</property> and <parameter>Re=
sultSet</parameter> instances had increased causing memory consumption in o=
ne instance. The JIRA issue contains the full details.
+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://opensource.atlassian.com/projects/hibernate/brows=
e/HHH-2662">JBPAPP-741 / HHH-2662</ulink> - Workarounds for <application>Po=
stgreSQL</application> issues arising from test suite
+			</title>
+			<para>
+				Few issues that arose from test suite with <application>PostgreSQL</ap=
plication> has been resolved.
+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://jira.jboss.org/jira/browse/JBPAPP-743">JBPAPP-743=
 / HHH-2663</ulink> - Map <property>java.sql.Types.REAL</property> to Hiber=
nate <property>FloatType</property> =

+			</title>
+			<para>
+				This is an added functionality to allow the use of <property>REAL</pro=
perty> type.
+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink url=3D"http://jira.jboss.org/jira/browse/JBPAPP-744">JBPAPP-744=
 / HHH-2665</ulink> - Split <property>Oracle9Dialect</property> into <prope=
rty>Oracle9iDialect</property> and <property>Oracle10gDialect</property>
+			</title>
+			<para>
+				Hibernate now checks <application>Oracle</application> database dialec=
ts for versions 9i and 10g. =

+			</para>
+		</formalpara>
+		<formalpara>
+			<title>
+				<ulink  url=3D"http://jira.jboss.org/jira/browse/JBPAPP-188">JBPAPP-18=
8 / HHH-2630</ulink> - Hibernate Dialect is not auto-detected for <applicat=
ion>Sybase ASE</application> and <application>DB2</application> =

+			</title>
+			<para>
+				Auto detection of these two dialects are now enabled in this release.
+			</para>
+		</formalpara>
+		=

+	</section>
+	<section id=3D"Documentation" xreflabel=3D"documentation">
 		<title>Documentation</title>
-		<para>
-			 List all the documentation links here and where to find them. =

-		</para>		=

+		<itemizedlist>
+			<listitem>
+				<para>
+					The <citetitle pubwork=3D"book">Hibernate reference guide</citetitle>=
 is a comprehensive source of material for learning about Hibernate. It kic=
ks off with an example to get you started with Hibernate, lists the major f=
unctionality of Hibernate, offers design solutions and suggests best practi=
ses.   =

+				</para>		=

+			</listitem>
+			<listitem>
+				<para>
+					The <citetitle pubwork=3D"book">Hibernate Core API Reference</citetit=
le> guide will be helpful during application development.
+				</para>
+			</listitem>
+		</itemizedlist>
 	</section>
 	<section id=3D"Product_Support">
-		<title>Product Support</title>
-		<para>
-			List all the links here. =

-		</para>		=

+		<title>Product Support and License Website Links</title>
+		<formalpara>
+			<title>Support Processes</title>
+			<para>
+				<ulink url=3D"http://www.redhat.com/support/process/">http://www.redha=
t.com/support/process/</ulink>
+			</para>
+		</formalpara>
+		=

+		<formalpara>
+			<title>
+				Production Support Scope of Coverage
+			</title>
+			<para>
+				<ulink url=3D"http://www.redhat.com/support/policy/soc/production">htt=
p://www.redhat.com/support/policy/soc/production</ulink>
+			</para>
+		</formalpara>
+				=

+		<formalpara>
+			<title>
+				Production Support Service Level Agreement
+			</title>
+			=

+			<para>
+				<ulink url=3D"http://www.redhat.com/support/policy/sla/production/">ht=
tp://www.redhat.com/support/policy/sla/production/</ulink>
+			</para>
+		</formalpara>
+		=

+		<formalpara>
+			<title>
+				Developer Support Scope of Coverage
+			</title>
+			=

+			<para>
+				<ulink url=3D"http://www.redhat.com/support/policy/soc/developer/">htt=
p://www.redhat.com/support/policy/soc/developer/</ulink>
+			</para>
+		</formalpara>
+		=

+		<formalpara>
+			<title>
+				Developer Support Service Level Agreement
+			</title>
+			=

+			<para>
+				<ulink url=3D"http://www.redhat.com/support/policy/sla/developer/">htt=
p://www.redhat.com/support/policy/sla/developer/</ulink>
+			</para>
+		</formalpara>
+		=

+		<formalpara>
+			<title>
+				Product Update and Support Policy by Product
+			</title>
+			=

+			<para>
+				<ulink url=3D"http://www.redhat.com/security/updates/jboss_notes/">htt=
p://www.redhat.com/security/updates/jboss_notes/</ulink>
+			</para>
+		</formalpara>
+		=

+		<formalpara>
+			<title>
+				JBoss End User License Agreement
+			</title>
+			=

+			<para>
+				<ulink url=3D"http://www.redhat.com/licenses/jboss_eula.html">http://w=
ww.redhat.com/licenses/jboss_eula.html</ulink>
+			</para>
+		</formalpara>
 	</section>
 </article>


--===============4666267670949239427==--

From hibernate-commits at lists.jboss.org Mon May 12 17:50:17 2008
Content-Type: multipart/mixed; boundary="===============8796634469431946458=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14659 - core/branches.
Date: Mon, 12 May 2008 17:50:15 -0400
Message-ID: <E1JvfuR-0003Ae-Co@committer01.frg.pub.inap.atl.jboss.com>

--===============8796634469431946458==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-12 17:50:14 -0400 (Mon, 12 May 2008)
New Revision: 14659

Removed:
   core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/
Log:
Removing Hibernate standalone tag corresponding to EAP 4.2 CP01 since it is=
 obsolete



--===============8796634469431946458==--

From hibernate-commits at lists.jboss.org Wed May 14 10:06:48 2008
Content-Type: multipart/mixed; boundary="===============3945111454878836414=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14660 -
 core/branches/Branch_3_2/src/org/hibernate/dialect.
Date: Wed, 14 May 2008 10:06:47 -0400
Message-ID: <E1JwHd1-0002t1-T3@committer01.frg.pub.inap.atl.jboss.com>

--===============3945111454878836414==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:06:47 -0400 (Wed, 14 May 2008)
New Revision: 14660

Modified:
   core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java
Log:
HHH-3282 : DB2Dialect#supportsLobValueChangePropogation =3D=3D false

Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java	2008=
-05-12 21:50:14 UTC (rev 14659)
+++ core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java	2008=
-05-14 14:06:47 UTC (rev 14660)
@@ -362,4 +362,8 @@
 	public boolean supportsEmptyInList() {
 		return false;
 	}
+
+	public boolean supportsLobValueChangePropogation() {
+		return false;
+	}
 }


--===============3945111454878836414==--

From hibernate-commits at lists.jboss.org Wed May 14 10:08:23 2008
Content-Type: multipart/mixed; boundary="===============6635122365634557436=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14661 -
 core/trunk/core/src/main/java/org/hibernate/dialect.
Date: Wed, 14 May 2008 10:08:23 -0400
Message-ID: <E1JwHeZ-0002xn-Ad@committer01.frg.pub.inap.atl.jboss.com>

--===============6635122365634557436==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:08:23 -0400 (Wed, 14 May 2008)
New Revision: 14661

Modified:
   core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
Log:
HHH-3282 : DB2Dialect#supportsLobValueChangePropogation =3D=3D false

Modified: core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java	200=
8-05-14 14:06:47 UTC (rev 14660)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java	200=
8-05-14 14:08:23 UTC (rev 14661)
@@ -362,4 +362,8 @@
 	public boolean supportsEmptyInList() {
 		return false;
 	}
+
+	public boolean supportsLobValueChangePropogation() {
+		return false;
+	}
 }


--===============6635122365634557436==--

From hibernate-commits at lists.jboss.org Wed May 14 10:48:07 2008
Content-Type: multipart/mixed; boundary="===============7281836561734013600=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14662 -
 core/trunk/testsuite/src/test/java/org/hibernate/test/hql.
Date: Wed, 14 May 2008 10:48:07 -0400
Message-ID: <E1JwIH1-0003cs-EE@committer01.frg.pub.inap.atl.jboss.com>

--===============7281836561734013600==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:48:07 -0400 (Wed, 14 May 2008)
New Revision: 14662

Modified:
   core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulati=
onTest.java
Log:
HHH-3283 : protection on vm-based timestamps where dialect does not support=
 params in INSERT ... SELECT

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkMan=
ipulationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulat=
ionTest.java	2008-05-14 14:08:23 UTC (rev 14661)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulat=
ionTest.java	2008-05-14 14:48:07 UTC (rev 14662)
@@ -318,11 +318,16 @@
 		data.cleanup();
 	}
 =

+	protected boolean supportsBulkInsertIdGeneration(Class entityClass) {
+		EntityPersister persister =3D sfi().getEntityPersister( entityClass.getN=
ame() );
+		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
+		return HqlSqlWalker.supportsIdGenWithBulkInsertion( generator );
+	}
+
 	public void testInsertWithGeneratedId() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( PettingZoo.class=
.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( PettingZoo.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
 =

@@ -351,7 +356,7 @@
 		s.close();
 =

 		assertEquals( zoo.getName(), pz.getName() );
-		assertTrue( zoo.getId() !=3D pz.getId() );
+		assertTrue( !zoo.getId().equals( pz.getId() ) );
 =

 		s =3D openSession();
 		t =3D s.beginTransaction();
@@ -362,9 +367,8 @@
 =

 	public void testInsertWithGeneratedVersionAndId() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( IntegerVersioned=
.class.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( IntegerVersioned.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
 =

@@ -407,11 +411,17 @@
 =

 	public void testInsertWithGeneratedTimestampVersion() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( TimestampVersion=
ed.class.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( TimestampVersioned.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
+		// dialects which do not allow a parameter in the select portion of an I=
NSERT ... SELECT statement
+		// will also be problematic for this test because the timestamp here is =
vm-based as opposed to
+		// db-based.
+		if ( !getDialect().supportsParametersInInsertSelect() ) {
+			reportSkip( "dialect does not support parameter in INSERT ... SELECT", =
"test bulk inserts with generated id and generated timestamp");
+			return;
+		}
 =

 		Session s =3D openSession();
 		Transaction t =3D s.beginTransaction();


--===============7281836561734013600==--

From hibernate-commits at lists.jboss.org Wed May 14 10:48:25 2008
Content-Type: multipart/mixed; boundary="===============5161107014040102299=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14663 -
 core/branches/Branch_3_2/test/org/hibernate/test/hql.
Date: Wed, 14 May 2008 10:48:25 -0400
Message-ID: <E1JwIHJ-0003d6-2X@committer01.frg.pub.inap.atl.jboss.com>

--===============5161107014040102299==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:48:24 -0400 (Wed, 14 May 2008)
New Revision: 14663

Modified:
   core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTes=
t.java
Log:
HHH-3283 : protection on vm-based timestamps where dialect does not support=
 params in INSERT ... SELECT

Modified: core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipula=
tionTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTe=
st.java	2008-05-14 14:48:07 UTC (rev 14662)
+++ core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTe=
st.java	2008-05-14 14:48:24 UTC (rev 14663)
@@ -318,11 +318,16 @@
 		data.cleanup();
 	}
 =

+	protected boolean supportsBulkInsertIdGeneration(Class entityClass) {
+		EntityPersister persister =3D sfi().getEntityPersister( entityClass.getN=
ame() );
+		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
+		return HqlSqlWalker.supportsIdGenWithBulkInsertion( generator );
+	}
+
 	public void testInsertWithGeneratedId() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( PettingZoo.class=
.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( PettingZoo.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
 =

@@ -351,7 +356,7 @@
 		s.close();
 =

 		assertEquals( zoo.getName(), pz.getName() );
-		assertTrue( zoo.getId() !=3D pz.getId() );
+		assertTrue( !zoo.getId().equals( pz.getId() ) );
 =

 		s =3D openSession();
 		t =3D s.beginTransaction();
@@ -362,9 +367,8 @@
 =

 	public void testInsertWithGeneratedVersionAndId() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( IntegerVersioned=
.class.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( IntegerVersioned.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
 =

@@ -407,11 +411,17 @@
 =

 	public void testInsertWithGeneratedTimestampVersion() {
 		// Make sure the env supports bulk inserts with generated ids...
-		EntityPersister persister =3D sfi().getEntityPersister( TimestampVersion=
ed.class.getName() );
-		IdentifierGenerator generator =3D persister.getIdentifierGenerator();
-		if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+		if ( !supportsBulkInsertIdGeneration( TimestampVersioned.class ) ) {
+			reportSkip( "bulk id generation not supported", "test bulk inserts with=
 generated id and generated timestamp");
 			return;
 		}
+		// dialects which do not allow a parameter in the select portion of an I=
NSERT ... SELECT statement
+		// will also be problematic for this test because the timestamp here is =
vm-based as opposed to
+		// db-based.
+		if ( !getDialect().supportsParametersInInsertSelect() ) {
+			reportSkip( "dialect does not support parameter in INSERT ... SELECT", =
"test bulk inserts with generated id and generated timestamp");
+			return;
+		}
 =

 		Session s =3D openSession();
 		Transaction t =3D s.beginTransaction();


--===============5161107014040102299==--

From hibernate-commits at lists.jboss.org Thu May 15 14:10:32 2008
Content-Type: multipart/mixed; boundary="===============7333567077836709492=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14664 -
 core/branches/Branch_3_2_4_SP1_CP.
Date: Thu, 15 May 2008 14:10:32 -0400
Message-ID: <E1JwhuS-0002F1-5M@committer01.frg.pub.inap.atl.jboss.com>

--===============7333567077836709492==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-15 14:10:32 -0400 (Thu, 15 May 2008)
New Revision: 14664

Removed:
   core/branches/Branch_3_2_4_SP1_CP/doc/
Log:
Removed doc; it is maintained by content services



--===============7333567077836709492==--

From hibernate-commits at lists.jboss.org Thu May 15 16:04:42 2008
Content-Type: multipart/mixed; boundary="===============6213018707873996604=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14665 - in
 core/branches/Branch_3_2_4_SP1_CP: test/org/hibernate/test/legacy and 1 other
 directory.
Date: Thu, 15 May 2008 16:04:42 -0400
Message-ID: <E1Jwjgw-0002Lo-Cp@committer01.frg.pub.inap.atl.jboss.com>

--===============6213018707873996604==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-15 16:04:42 -0400 (Thu, 15 May 2008)
New Revision: 14665

Modified:
   core/branches/Branch_3_2_4_SP1_CP/build.xml
   core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/Configu=
rationPerformanceTest.java
Log:
HIBERNATE-96 : Split distribution into separate source and binary distribut=
ions


Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/build.xml	2008-05-15 18:10:32 UTC (re=
v 14664)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml	2008-05-15 20:04:42 UTC (re=
v 14665)
@@ -176,10 +176,7 @@
 		<delete dir=3D"${dir.out.db}" />
 	</target>
 =

-
-    <!-- The ANTLR related targets -->
-
-    <target name=3D"init.antlr" depends=3D"init" description=3D"Check ANTL=
R dependencies.">
+    <target name=3D"init.antlr" depends=3D"init" unless=3D"antlr.isUpToDat=
e" description=3D"Check ANTLR dependencies.">
         <uptodate property=3D"antlr.isUpToDate" targetfile=3D"${dir.out.an=
tlr-package}/.antlr_run">
 			<srcfiles dir=3D"${dir.grammar}" includes=3D"*.g"/>
 		</uptodate>
@@ -223,7 +220,7 @@
 =

     <!-- Compilation targets -->
 =

-    <target name=3D"compile" depends=3D"init,antlr" description=3D"Compile=
 the Java source code">
+    <target name=3D"compile" depends=3D"init,antlr" unless=3D"classes.isUp=
ToDate" description=3D"Compile the Java source code">
 		<mkdir dir=3D"${dir.out.classes}"/>
 		<available classname=3D"org.eclipse.core.launcher.Main" property=3D"buil=
d.compiler"
                    value=3D"org.eclipse.jdt.core.JDTCompilerAdapter" class=
path=3D"${java.class.path}"/>
@@ -246,7 +243,7 @@
 		</copy>
 	</target>
 =

-	<target name=3D"compiletest" depends=3D"compile" description=3D"Compile t=
he tests">
+	<target name=3D"compiletest" depends=3D"compile" unless=3D"test-classes.i=
sUpToDate" description=3D"Compile the tests">
 		<mkdir dir=3D"${dir.out.test-classes}"/>
 		<available classname=3D"org.eclipse.core.launcher.Main" property=3D"buil=
d.compiler"
                    value=3D"org.eclipse.jdt.core.JDTCompilerAdapter" class=
path=3D"${java.class.path}"/>
@@ -295,8 +292,19 @@
 		<unzip src=3D"${basedir}/${jar.name}.jar" dest=3D"${dir.out.classes}" />
 		<unzip src=3D"${basedir}/${testjar.name}.jar" dest=3D"${dir.out.test-cla=
sses}" />
 		<delete dir=3D"${dir.out.generated-source}" />		=

-		<mkdir dir=3D"${dir.out.antlr-package}" />
-		<touch file=3D"${dir.out.antlr-package}/.antlr_run"/>
+		<available file=3D"${dir.out.classes}/org/hibernate/hql/antlr"
+			type=3D"dir" =

+			property=3D"antlr.isUpToDate"/>
+		<available file=3D"${dir.out.classes}/org/hibernate"
+			type=3D"dir" =

+			property=3D"classes.isUpToDate"/>
+		<available file=3D"${dir.out.test-classes}/org/hibernate/test"
+			type=3D"dir" =

+			property=3D"test-classes.isUpToDate"/>
+		<property name=3D"test-classes.isFromJar" value=3D"$test-classes.isUpToD=
ate" />
+		<echo message=3D"antlr.isUpToDate=3D${antlr.isUpToDate}" />
+		<echo message=3D"classes.isUpToDate=3D${classes.isUpToDate}" />
+		<echo message=3D"test-classes.isUpToDate=3D${test-classes.isUpToDate}" />
 	</target>
 =

     <target name=3D"junit" depends=3D"junit.prepare">
@@ -515,7 +523,7 @@
 =

     <!-- Instrumentation tasks -->
 =

-    <target name=3D"instrument.prepare">
+    <target name=3D"instrument.clean">
         <delete>
             <fileset dir=3D"${dir.out.test-classes}">
                 <patternset refid=3D"ps.instrument.domain" />
@@ -523,28 +531,35 @@
         </delete>
     </target>
 =

-    <target name=3D"instrument.cglib" depends=3D"instrument.prepare,compil=
etest" description=3D"Performs cglib-based instrumentation">
-		<taskdef name=3D"instrument" classname=3D"org.hibernate.tool.instrument.=
cglib.InstrumentTask">
-			<classpath path=3D"${dir.out.classes}"/>
-			<classpath refid=3D"path.lib"/>
-		</taskdef>
 =

-		<available classname=3D"org.eclipse.core.launcher.Main" property=3D"buil=
d.compiler"
+    <target name=3D"instrument.prepare-from-testjar" depends=3D"instrument=
.clean" if=3D"test-classes.isFromJar">
+        <unzip src=3D"${basedir}/${testjar.name}.jar" dest=3D"${dir.out.te=
st-classes}" />
+    </target>
+
+    <target name=3D"instrument.prepare" depends=3D"instrument.prepare-from=
-testjar" unless=3D"test-classes.isFromJar">
+        <available classname=3D"org.eclipse.core.launcher.Main" property=
=3D"build.compiler"
                    value=3D"org.eclipse.jdt.core.JDTCompilerAdapter" class=
path=3D"${java.class.path}"/>
-		<javac destdir=3D"${dir.out.test-classes}"
+        <javac destdir=3D"${dir.out.test-classes}"
                debug=3D"${javac.debug}"
                optimize=3D"${javac.optimize}"
                target=3D"${javac.target}"
                source=3D"${javac.source}"
                nowarn=3D"on">
-			<classpath>
-				<path refid=3D"path.lib" />
-				<pathelement path=3D"${dir.out.classes}" />
-			</classpath>
+	    <classpath>
+                <path refid=3D"path.lib" />
+                <pathelement path=3D"${dir.out.classes}" />
+            </classpath>
             <src path=3D"${dir.test}" />
             <patternset refid=3D"ps.instrument.domain" />
         </javac>
+    </target>
 =

+
+    <target name=3D"instrument.cglib" depends=3D"instrument.prepare,compil=
etest" description=3D"Performs cglib-based instrumentation">
+        <taskdef name=3D"instrument" classname=3D"org.hibernate.tool.instr=
ument.cglib.InstrumentTask">
+            <classpath path=3D"${dir.out.classes}"/>
+            <classpath refid=3D"path.lib"/>
+        </taskdef>
         <instrument verbose=3D"true">
             <fileset dir=3D"${dir.out.test-classes}">
                 <patternset refid=3D"ps.instrument.domain" />
@@ -553,27 +568,10 @@
     </target>
 =

     <target name=3D"instrument.javassist" depends=3D"instrument.prepare,co=
mpiletest" description=3D"Performs javassist-based instrumentation">
-		<taskdef name=3D"instrument" classname=3D"org.hibernate.tool.instrument.=
javassist.InstrumentTask">
-			<classpath path=3D"${dir.out.classes}"/>
-			<classpath refid=3D"path.lib"/>
-		</taskdef>
-
-		<available classname=3D"org.eclipse.core.launcher.Main" property=3D"buil=
d.compiler"
-                   value=3D"org.eclipse.jdt.core.JDTCompilerAdapter" class=
path=3D"${java.class.path}"/>
-		<javac destdir=3D"${dir.out.test-classes}"
-               debug=3D"${javac.debug}"
-               optimize=3D"${javac.optimize}"
-               target=3D"${javac.target}"
-               source=3D"${javac.source}"
-               nowarn=3D"on">
-			<classpath>
-				<path refid=3D"path.lib" />
-				<pathelement path=3D"${dir.out.classes}" />
-			</classpath>
-            <src path=3D"${dir.test}" />
-            <patternset refid=3D"ps.instrument.domain" />
-        </javac>
-
+        <taskdef name=3D"instrument" classname=3D"org.hibernate.tool.instr=
ument.javassist.InstrumentTask">
+            <classpath path=3D"${dir.out.classes}"/>
+            <classpath refid=3D"path.lib"/>
+        </taskdef>
         <instrument verbose=3D"true">
             <fileset dir=3D"${dir.out.test-classes}">
                 <patternset refid=3D"ps.instrument.domain" />
@@ -581,7 +579,6 @@
         </instrument>
     </target>
 =

-
     <!-- Distribution related targets -->
 =

 	<target name=3D"versioncheck" description=3D"Check version.properties up =
against lib directory">
@@ -672,11 +669,11 @@
 		</jar>
 	</target>
 =

-	<target name=3D"dist" depends=3D"init,versioncheck,jar,testjar,javadoc,re=
fdoc,antlr.bnf"
-            description=3D"Build everything and package">
-        <mkdir dir=3D"${dir.dist}" />
+	<target name=3D"dist" depends=3D"init,versioncheck,jar,testjar"
+		description=3D"Build everything and package">
+		<mkdir dir=3D"${dir.dist}" />
 =

-        <!-- prepare build.xml -->
+		<!-- prepare build.xml -->
 		<copy file=3D"${basedir}/build.xml" todir=3D"${dir.dist}"/>
 		<replace file=3D"${dir.dist}/build.xml">
 			<replacetoken><![CDATA[../${name}-${version}]]></replacetoken>
@@ -687,70 +684,45 @@
 			<replacevalue><![CDATA[name=3D"dir.jdbc" value=3D"lib"]]></replacevalue>
 		</replace>
 =

-        <zip zipfile=3D"${dir.dist}/${fullname}.zip">
-            <zipfileset prefix=3D"${name}-${version.major_minor}/doc/refer=
ence" dir=3D"${dir.doc.ref}/build" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}/doc/tutor=
ial" dir=3D"${dir.doc.ref}/tutorial" >
-				<include name=3D"src/**" />
-				<include name=3D"lib/**" />
-				<include name=3D"build.xml" />
-				<include name=3D"runCleanDatabase.sh" />
-				<include name=3D"web.xml" />
-            </zipfileset>
-		    <zipfileset prefix=3D"${name}-${version.major_minor}/doc/other" dir=
=3D"${dir.doc}/other" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}/doc" dir=
=3D"${dir.out.doc}" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}/eg" dir=
=3D"${dir.eg}"/>
-			<zipfileset prefix=3D"${name}-${version.major_minor}/etc" dir=3D"${dir.=
etc}"/>
-			<zipfileset prefix=3D"${name}-${version.major_minor}/grammar" dir=3D"${=
dir.grammar}"/>
+		<zip zipfile=3D"${dir.dist}/${fullname}.zip">
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${dir.bui=
ld}/${jar.name}.jar" />
 			<zipfileset prefix=3D"${name}-${version.major_minor}/lib"  dir=3D"${dir=
.build}/versioncheck-dist"/>
-			<zipfileset prefix=3D"${name}-${version.major_minor}/src" dir=3D"${dir.=
src}"/>
-			<zipfileset prefix=3D"${name}-${version.major_minor}/test" dir=3D"${dir=
.test}"/>
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/readme.txt" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/lgpl.txt" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/JBossORG-EULA.txt" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/changelog.txt" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/build.bat" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/build.sh" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/hibernate_logo.gif" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.dist}/build.xml" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.build}/${jar.name}.jar" />
-            <zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.build}/${testjar.name}.jar" />
-        </zip>
-        <checksum file=3D"${dir.dist}/${fullname}.zip" algorithm=3D"MD5" f=
ileext=3D".md5.txt"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}/eg" dir=3D"${dir.e=
g}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/build.bat" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/build.sh" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${dir.dis=
t}/build.xml" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}/etc" dir=3D"${dir.=
etc}">
+				<exclude name=3D"ehcache.xml" />
+				<exclude name=3D"oscache.properties" />
+			</zipfileset>
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/lgpl.txt" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/JBossORG-EULA.txt" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/readme.txt" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${dir.bui=
ld}/${testjar.name}.jar" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}" file=3D"${basedir=
}/hibernate_logo.gif" />
+		</zip>
+		<checksum file=3D"${dir.dist}/${fullname}.zip" algorithm=3D"MD5" fileext=
=3D".md5.txt"/>
 =

-        <tar tarfile=3D"${dir.dist}/${fullname}.tar">
-            <tarfileset prefix=3D"${name}-${version.major_minor}/doc/refer=
ence" dir=3D"${dir.doc.ref}/build" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}/doc/tutor=
ial" dir=3D"${dir.doc.ref}/tutorial" >
-				<include name=3D"src/**" />
-				<include name=3D"lib/**" />
-				<include name=3D"build.xml" />
-				<include name=3D"runCleanDatabase.sh" />
-				<include name=3D"web.xml" />
-            </tarfileset>
-		    <tarfileset prefix=3D"${name}-${version.major_minor}/doc/other" dir=
=3D"${dir.doc}/other" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}/doc" dir=
=3D"${dir.out.doc}" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}/eg" dir=
=3D"${dir.eg}"/>
-			<tarfileset prefix=3D"${name}-${version.major_minor}/etc" dir=3D"${dir.=
etc}"/>
-			<tarfileset prefix=3D"${name}-${version.major_minor}/grammar" dir=3D"${=
dir.grammar}"/>
-			<tarfileset prefix=3D"${name}-${version.major_minor}/lib" dir=3D"${dir.=
build}/versioncheck-dist"/>
-			<tarfileset prefix=3D"${name}-${version.major_minor}/src" dir=3D"${dir.=
src}"/>
-			<tarfileset prefix=3D"${name}-${version.major_minor}/test" dir=3D"${dir=
.test}"/>
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/readme.txt" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/lgpl.txt" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/JBossORG-EULA.txt" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/changelog.txt" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/build.bat" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/build.sh" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${basedir}/hibernate_logo.gif" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.dist}/build.xml" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.build}/${jar.name}.jar" />
-            <tarfileset prefix=3D"${name}-${version.major_minor}" file=3D"=
${dir.build}/${testjar.name}.jar" />
-		</tar>
-		<gzip src=3D"${dir.dist}/${fullname}.tar" zipfile=3D"${dir.dist}/${fulln=
ame}.tar.gz"/>
-        <checksum file=3D"${dir.dist}/${fullname}.tar.gz" algorithm=3D"MD5=
" fileext=3D".md5.txt"/>
+		<zip zipfile=3D"${dir.dist}/${fullname}-src.zip">
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/src" dir=3D"${=
dir.src}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/grammar" dir=
=3D"${dir.grammar}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/grammar/gensrc=
" dir=3D"${dir.out.generated-source}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/test" dir=3D"$=
{dir.test}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/lib"  dir=3D"$=
{dir.build}/versioncheck-dist"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/eg" dir=3D"${d=
ir.eg}"/>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src" file=3D"${bas=
edir}/build.bat" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src" file=3D"${bas=
edir}/build.sh" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src" file=3D"${dir=
.dist}/build.xml" />
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src/etc" dir=3D"${=
dir.etc}">
+				<exclude name=3D"ehcache.xml" />
+				<exclude name=3D"oscache.properties" />
+			</zipfileset>
+			<zipfileset prefix=3D"${name}-${version.major_minor}-src" file=3D"${bas=
edir}/hibernate_logo.gif" />
+        	</zip>
+        	<checksum file=3D"${dir.dist}/${fullname}-src.zip" algorithm=3D"M=
D5" fileext=3D".md5.txt"/>
 =

-        <delete file=3D"${dir.dist}/${fullname}.tar"/>
-        <delete file=3D"${dir.dist}/build.xml"/>
-    </target>
+        	<delete file=3D"${dir.dist}/build.xml"/>
+    	</target>
 =

     <target name=3D"dist.complete" depends=3D"init,versioncheck,jar,javado=
c,refdoc,antlr.bnf"
             description=3D"Build and package everything, and run test suit=
e and eg example">

Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/=
ConfigurationPerformanceTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/Config=
urationPerformanceTest.java	2008-05-15 18:10:32 UTC (rev 14664)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/Config=
urationPerformanceTest.java	2008-05-15 20:04:42 UTC (rev 14665)
@@ -83,7 +83,7 @@
 =

 	public void testLoadingAndSerializationOfConfiguration() throws Hibernate=
Exception, FileNotFoundException, IOException, ClassNotFoundException {
 =

-		String prefix =3D "./test/org/hibernate/test/";
+		String prefix =3D "./build/testclasses/org/hibernate/test/";
 		try {
 			// first time
 			System.err.println("###FIRST SAVELOAD###");


--===============6213018707873996604==--

From hibernate-commits at lists.jboss.org Thu May 15 16:49:07 2008
Content-Type: multipart/mixed; boundary="===============4407198364955982969=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14666 - core/tags.
Date: Thu, 15 May 2008 16:49:07 -0400
Message-ID: <E1JwkNv-00041H-Od@committer01.frg.pub.inap.atl.jboss.com>

--===============4407198364955982969==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-15 16:49:07 -0400 (Thu, 15 May 2008)
New Revision: 14666

Added:
   core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
HIBERNATE-84 : tag for Hibernate 3.2.4.sp1.cp03 standalone


Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE (from rev 14665, core=
/branches/Branch_3_2_4_SP1_CP)


--===============4407198364955982969==--

From hibernate-commits at lists.jboss.org Fri May 16 11:55:53 2008
Content-Type: multipart/mixed; boundary="===============0541606823937442940=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14667 - in
 core/branches/Branch_3_2_4_SP1_CP: doc and 1 other directories.
Date: Fri, 16 May 2008 11:55:53 -0400
Message-ID: <E1Jx2Hh-0006BJ-Cw@committer01.frg.pub.inap.atl.jboss.com>

--===============0541606823937442940==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-16 11:55:53 -0400 (Fri, 16 May 2008)
New Revision: 14667

Added:
   core/branches/Branch_3_2_4_SP1_CP/doc/
   core/branches/Branch_3_2_4_SP1_CP/doc/api/
   core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css
   core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html
Log:
Adding doc/api back in


Added: core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css	                 =
       (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css	2008-05-16 15:55:=
53 UTC (rev 14667)
@@ -0,0 +1,117 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the de=
faults  */
+
+/* Page background color */
+body { 	font-family: Arial;
+	background-color: white;
+	font-size: 10pt;
+ }
+td { 	font-family: Arial;
+	font-size: 10pt;
+ }
+/* Table colors */
+.TableHeadingColor     { background: #F4F4F4 }
+.TableSubHeadingColor  { background: #F4F4F4 }
+.TableRowColor         { background: #FFFFFF }
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: normal; font-family: Arial }
+.FrameHeadingFont { font-size: normal; font-family: Arial }
+.FrameItemFont    { font-size: normal; font-family: Arial }
+
+/* Example of smaller, sans-serif font in frames */
+/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-=
serif } */
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#F4F4F4;}
+.NavBarCell1Rev { background-color:silver;}
+
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000=
;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF=
;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-co=
lor:#FFFFFF;}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-co=
lor:#FFFFFF;}
+
+A {
+    color: #003399;
+}
+
+A:active {
+    color: #003399;
+}
+
+A:visited {
+    color: #888888;
+}
+
+P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+    color: #000000;
+}
+
+TD, TH, SPAN {
+    color: #000000;
+}
+
+BLOCKQUOTE {
+    margin-right: 0px;
+}
+
+
+/*H1, H2, H3, H4, H5, H6    {
+    color: #000000;
+    font-weight:500;
+    margin-top:10px;
+    padding-top:15px;
+}
+
+H1 { font-size: 150%; }
+H2 { font-size: 140%; }
+H3 { font-size: 110%; font-weight: bold; }
+H4 { font-size: 110%; font-weight: bold;}
+H5 { font-size: 100%; font-style: italic; }
+H6 { font-size: 100%; font-style: italic; }*/
+
+TT {
+font-size: 90%;
+    font-family: "Courier New", Courier, monospace;
+    color: #000000;
+}
+
+PRE {
+font-size: 90%;
+    padding: 5px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #CCCCCC;
+    background-color: #F4F4F4;
+}
+
+UL, OL, LI {
+    list-style: disc;
+}
+
+HR  {
+    width: 100%;
+    height: 1px;
+    background-color: #CCCCCC;
+    border-width: 0px;
+    padding: 0px;
+    color: #CCCCCC;
+}
+
+.variablelist { =

+    padding-top: 10; =

+    padding-bottom:10; =

+    margin:0;
+}
+
+.itemizedlist, UL { =

+    padding-top: 0; =

+    padding-bottom:0; =

+    margin:0; =

+}
+
+.term { =

+    font-weight:bold;
+}

Added: core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html	                =
        (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html	2008-05-16 15:55=
:53 UTC (rev 14667)
@@ -0,0 +1,39 @@
+<body>
+
+<h2>Hibernate API</h2>
+
+This documentation concentrates upon the following <b>Core API</b> interfa=
ces:
+<li><tt>org.hibernate.Hibernate</tt></li>
+<li><tt>org.hibernate.Session</tt></li>
+<li><tt>org.hibernate.SessionFactory</tt></li>
+<li><tt>org.hibernate.Transaction</tt></li>
+<li><tt>org.hibernate.Query</tt></li>
+<li><tt>org.hibernate.Criteria</tt></li>
+<li><tt>org.hibernate.ScrollableResults</tt></li>
+<li><tt>org.hibernate.cfg.Configuration</tt></li>
+<li><tt>org.hibernate.expression.Expression</tt></li>
+<li><tt>org.hibernate.expression.Order</tt></li>
+<li><tt>org.hibernate.expression.Example</tt></li>
+These interfaces are fully intended to be exposed to application code.<br>
+<br>
+The <b>Extension API</b> is intended to be used by application programmers
+to extend Hibernate functionality. None of these interfaces are intended
+to be called by the application - they are called internally by Hibernate.
+This API is less stable than the Core API. The safest way to extend
+functionality is to contribute extensions back to the project; that way
+extensions will be updated when the Extension API changes.<br>
+<br>
+Full Hibernate documentation may be found at
+<a href=3D"http://hibernate.org">hibernate.org</a>.
+(a)see org.hibernate.Hibernate
+(a)see org.hibernate.Session
+(a)see org.hibernate.SessionFactory
+(a)see org.hibernate.Transaction
+(a)see org.hibernate.Query
+(a)see org.hibernate.Criteria
+(a)see org.hibernate.ScrollableResults
+(a)see org.hibernate.cfg.Configuration
+(a)see org.hibernate.expression.Expression
+(a)see org.hibernate.expression.Order
+(a)see org.hibernate.expression.Example
+</body>


--===============0541606823937442940==--

From hibernate-commits at lists.jboss.org Fri May 16 11:59:01 2008
Content-Type: multipart/mixed; boundary="===============5925443505699639843=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14668 - core/tags.
Date: Fri, 16 May 2008 11:59:01 -0400
Message-ID: <E1Jx2Kj-0006Hn-Hf@committer01.frg.pub.inap.atl.jboss.com>

--===============5925443505699639843==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-16 11:59:01 -0400 (Fri, 16 May 2008)
New Revision: 14668

Removed:
   core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
Removing the tag; it will be recreated with API dependencies



--===============5925443505699639843==--

From hibernate-commits at lists.jboss.org Fri May 16 12:27:59 2008
Content-Type: multipart/mixed; boundary="===============6879694800978211361=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14669 - core/tags.
Date: Fri, 16 May 2008 12:27:59 -0400
Message-ID: <E1Jx2ml-0004rr-BB@committer01.frg.pub.inap.atl.jboss.com>

--===============6879694800978211361==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: gbadner
Date: 2008-05-16 12:27:59 -0400 (Fri, 16 May 2008)
New Revision: 14669

Added:
   core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
Retagging with dependencies for building javadoc


Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE (from rev 14668, core=
/branches/Branch_3_2_4_SP1_CP)


--===============6879694800978211361==--

From hibernate-commits at lists.jboss.org Sat May 17 08:47:33 2008
Content-Type: multipart/mixed; boundary="===============0858559869409147982=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14670 - in
 commons-annotations/trunk: src/java/org/hibernate/annotations/common and 1
 other directory.
Date: Sat, 17 May 2008 08:47:33 -0400
Message-ID: <E1JxLoz-0005LQ-4N@committer01.frg.pub.inap.atl.jboss.com>

--===============0858559869409147982==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-17 08:47:32 -0400 (Sat, 17 May 2008)
New Revision: 14670

Modified:
   commons-annotations/trunk/ivy.xml
   commons-annotations/trunk/pom.xml
   commons-annotations/trunk/src/java/org/hibernate/annotations/common/Asse=
rtionFailure.java
Log:
HCANN-1 move to slf4j

Modified: commons-annotations/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/ivy.xml	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/ivy.xml	2008-05-17 12:47:32 UTC (rev 14670)
@@ -13,11 +13,8 @@
     </publications>
     <dependencies>
 		<!-- compile time dependencies -->
-        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>
 =

-        <!-- transitive dependencies -->
-        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/> <!-- soon to be a dep -->
-
         <!-- test deps -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"tes=
t->default"/>
         <dependency org=3D"org.slf4j" name=3D"slf4j-log4j12" rev=3D"1.4.2"=
 conf=3D"test->default"/>

Modified: commons-annotations/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/pom.xml	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/pom.xml	2008-05-17 12:47:32 UTC (rev 14670)
@@ -20,9 +20,9 @@
 	</scm>
 	<dependencies>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.2</version>
+        </dependency>
 	</dependencies>
 </project>
\ No newline at end of file

Modified: commons-annotations/trunk/src/java/org/hibernate/annotations/comm=
on/AssertionFailure.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/Ass=
ertionFailure.java	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/Ass=
ertionFailure.java	2008-05-17 12:47:32 UTC (rev 14670)
@@ -1,9 +1,10 @@
 //$Id: $
 package org.hibernate.annotations.common;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

+
 /**
  * Indicates failure of an assertion: a possible bug in Hibernate.
  *
@@ -13,7 +14,7 @@
 //TODO Copy from Hibernate Core, do some mutualization here?
 public class AssertionFailure extends RuntimeException {
 =

-	private static final Log log =3D LogFactory.getLog(AssertionFailure.class=
);
+	private static final Logger log =3D LoggerFactory.getLogger(AssertionFail=
ure.class);
 =

 	private static final String MESSAGE =3D "an assertion failure occured (th=
is may indicate a bug in Hibernate)";
 =



--===============0858559869409147982==--

From hibernate-commits at lists.jboss.org Sat May 17 08:49:38 2008
Content-Type: multipart/mixed; boundary="===============8221554846171933715=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14671 - in annotations/trunk:
 src/java/org/hibernate/cfg and 5 other directories.
Date: Sat, 17 May 2008 08:49:38 -0400
Message-ID: <E1JxLr0-0005Oi-FF@committer01.frg.pub.inap.atl.jboss.com>

--===============8221554846171933715==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-17 08:49:38 -0400 (Sat, 17 May 2008)
New Revision: 14671

Modified:
   annotations/trunk/ivy.xml
   annotations/trunk/pom.xml
   annotations/trunk/src/java/org/hibernate/cfg/AnnotationBinder.java
   annotations/trunk/src/java/org/hibernate/cfg/AnnotationConfiguration.java
   annotations/trunk/src/java/org/hibernate/cfg/BinderHelper.java
   annotations/trunk/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
   annotations/trunk/src/java/org/hibernate/cfg/Ejb3Column.java
   annotations/trunk/src/java/org/hibernate/cfg/ExtendedMappings.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBinde=
r.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/EntityBinder.ja=
va
   annotations/trunk/src/java/org/hibernate/cfg/annotations/ListBinder.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/PropertyBinder.=
java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/QueryBinder.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/ResultsetMappin=
gSecondPass.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/SetBinder.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/SimpleValueBind=
er.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/TableBinder.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/EJB3=
OverridenAnnotationReader.java
   annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/XMLC=
ontext.java
   annotations/trunk/src/java/org/hibernate/cfg/search/SearchConfiguration.=
java
   annotations/trunk/src/java/org/hibernate/type/EnumType.java
   annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Log=
Listener.java
   annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Oth=
erLogListener.java
Log:
ANN-741 move to slf4j

Modified: annotations/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/ivy.xml	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/ivy.xml	2008-05-17 12:49:38 UTC (rev 14671)
@@ -16,11 +16,11 @@
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
         <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
-        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"def=
ault->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>
 =

+
         <!-- transitive dependencies -->
-        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/>
         <dependency org=3D"antlr" name=3D"antlr" rev=3D"2.7.6" conf=3D"tes=
t->default"/>
         <dependency org=3D"commons-collections" name=3D"commons-collection=
s" rev=3D"3.1" conf=3D"test->default"/>
 =


Modified: annotations/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/pom.xml	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/pom.xml	2008-05-17 12:49:38 UTC (rev 14671)
@@ -38,10 +38,10 @@
 			<version>3.3.0.CR1</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.2</version>
+        </dependency>
         <dependency>
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>

Modified: annotations/trunk/src/java/org/hibernate/cfg/AnnotationBinder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/AnnotationBinder.java	2008=
-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/AnnotationBinder.java	2008=
-05-17 12:49:38 UTC (rev 14671)
@@ -49,8 +49,6 @@
 import javax.persistence.Transient;
 import javax.persistence.Version;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
@@ -135,6 +133,8 @@
 import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.type.TypeFactory;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * JSR 175 annotation binder
@@ -165,7 +165,7 @@
 	private AnnotationBinder() {
 	}
 =

-	private static final Log log =3D LogFactory.getLog( AnnotationBinder.clas=
s );
+	private static final Logger log =3D LoggerFactory.getLogger( AnnotationBi=
nder.class );
 =

 	public static void bindDefaults(ExtendedMappings mappings) {
 		Map defaults =3D mappings.getReflectionManager().getDefaults();
@@ -219,14 +219,14 @@
 			pckg =3D mappings.getReflectionManager().packageForName( packageName );
 		}
 		catch (ClassNotFoundException cnf) {
-			log.warn( "Package not found or wo package-info.java: " + packageName );
+			log.warn( "Package not found or wo package-info.java: {}", packageName =
);
 			return;
 		}
 		if ( pckg.isAnnotationPresent( SequenceGenerator.class ) ) {
 			SequenceGenerator ann =3D pckg.getAnnotation( SequenceGenerator.class );
 			IdGenerator idGen =3D buildIdGenerator( ann, mappings );
 			mappings.addGenerator( idGen );
-			log.debug( "Add sequence generator with name: " + idGen.getName() );
+			log.debug( "Add sequence generator with name: {}", idGen.getName() );
 		}
 		if ( pckg.isAnnotationPresent( TableGenerator.class ) ) {
 			TableGenerator ann =3D pckg.getAnnotation( TableGenerator.class );
@@ -351,7 +351,7 @@
 				idGen.addParam( MultipleHiLoPerTableGenerator.PK_VALUE_NAME, tabGen.pk=
ColumnValue() );
 			}
 			idGen.addParam( TableHiLoGenerator.MAX_LO, String.valueOf( tabGen.alloc=
ationSize() - 1 ) );
-			log.debug( "Add table generator with name: " + idGen.getName() );
+			log.debug( "Add table generator with name: {}", idGen.getName() );
 		}
 		else if ( ann instanceof SequenceGenerator ) {
 			SequenceGenerator seqGen =3D (SequenceGenerator) ann;
@@ -368,7 +368,7 @@
 				);
 			}
 			idGen.addParam( SequenceHiLoGenerator.MAX_LO, String.valueOf( seqGen.al=
locationSize() - 1 ) );
-			log.debug( "Add sequence generator with name: " + idGen.getName() );
+			log.debug( "Add sequence generator with name: {}", idGen.getName() );
 		}
 		else if ( ann instanceof GenericGenerator ) {
 			GenericGenerator genGen =3D (GenericGenerator) ann;
@@ -378,7 +378,7 @@
 			for (Parameter parameter : params) {
 				idGen.addParam( parameter.name(), parameter.value() );
 			}
-			log.debug( "Add generic generator with name: " + idGen.getName() );
+			log.debug( "Add generic generator with name: {}", idGen.getName() );
 		}
 		else {
 			throw new AssertionFailure( "Unknown Generator annotation: " + ann );
@@ -403,7 +403,7 @@
 			if ( AnnotatedClassType.NONE.equals( classType )
 					&& clazzToProcess.isAnnotationPresent( org.hibernate.annotations.Enti=
ty.class ) ) {
 				log.warn( "Class annotated @org.hibernate.annotations.Entity but not j=
avax.persistence.Entity "
-						+ "(most likely a user error): " + clazzToProcess.getName() );
+						+ "(most likely a user error): {}", clazzToProcess.getName() );
 			}
 			return;
 		}
@@ -415,7 +415,7 @@
 			);
 		}
 		XAnnotatedElement annotatedClass =3D clazzToProcess;
-		if ( log.isInfoEnabled() ) log.info( "Binding entity from annotated clas=
s: " + clazzToProcess.getName() );
+		log.info( "Binding entity from annotated class: {}", clazzToProcess.getN=
ame() );
 		InheritanceState superEntityState =3D
 				InheritanceState.getSuperEntityInheritanceState(
 						clazzToProcess, inheritanceStatePerClass, mappings.getReflectionMana=
ger()
@@ -507,8 +507,8 @@
 			}
 			if ( discAnn !=3D null && inheritanceState.hasParents ) {
 				log.warn(
-						"Discriminator column has to be defined in the root entity, it will =
be ignored in subclass: "
-								+ clazzToProcess.getName()
+						"Discriminator column has to be defined in the root entity, it will =
be ignored in subclass: {}",
+						clazzToProcess.getName()
 				);
 			}
 			discrimValue =3D annotatedClass.isAnnotationPresent( DiscriminatorValue=
.class ) ?
@@ -655,7 +655,7 @@
 		}
 		if ( onDeleteAnn !=3D null && !onDeleteAppropriate ) {
 			log.warn(
-					"Inapropriate use of @OnDelete on entity, annotation ignored: " + pro=
pertyHolder.getEntityName()
+					"Inapropriate use of @OnDelete on entity, annotation ignored: {}", pr=
opertyHolder.getEntityName()
 			);
 		}
 =

@@ -944,7 +944,7 @@
 			params.put( param.name(), TypeFactory.heuristicType( param.type() ) );
 		}
 		FilterDefinition def =3D new FilterDefinition( defAnn.name(), defAnn.def=
aultCondition(), params );
-		if ( log.isInfoEnabled() ) log.info( "Binding filter definition: " + def=
.getFilterName() );
+		log.info( "Binding filter definition: {}", def.getFilterName() );
 		mappings.addFilterDefinition( def );
 	}
 =

@@ -966,7 +966,7 @@
 		for (Parameter param : defAnn.parameters()) {
 			params.setProperty( param.name(), param.value() );
 		}
-		if ( log.isInfoEnabled() ) log.info( "Binding type definition: " + defAn=
n.name() );
+		log.info( "Binding type definition: {}", defAnn.name() );
 		mappings.addTypeDef( defAnn.name(), defAnn.typeClass().getName(), params=
 );
 	}
 =

@@ -986,7 +986,7 @@
 			discriminatorColumn.linkWithValue( discrim );
 			discrim.setTypeName( discriminatorColumn.getDiscriminatorTypeName() );
 			rootClass.setPolymorphic( true );
-			log.debug( "Setting discriminator for entity " + rootClass.getEntityNam=
e() );
+			log.debug( "Setting discriminator for entity {}", rootClass.getEntityNa=
me() );
 		}
 	}
 =

@@ -1019,7 +1019,7 @@
 			}
 		}
 =

-		log.debug( "Processing " + propertyHolder.getEntityName() + " " + access=
Type + " annotation" );
+		log.debug( "Processing {} {} annotation", propertyHolder.getEntityName()=
, accessType );
 		List<XProperty> properties =3D annotatedClass.getDeclaredProperties( acc=
essType );
 		//order so that property are used in the same order when binding native =
query
 		Collections.sort( properties, new Comparator<XProperty>() {
@@ -1130,11 +1130,9 @@
 		 */
 		Ejb3Column[] columns =3D null;
 		Ejb3JoinColumn[] joinColumns =3D null;
-		if ( log.isDebugEnabled() ) {
-			log.debug(
-					"Processing annotations of " + propertyHolder.getEntityName() + "." +=
 inferredData.getPropertyName()
-			);
-		}
+		log.debug(
+				"Processing annotations of {}.{}", propertyHolder.getEntityName(), inf=
erredData.getPropertyName()
+		);
 =

 		if ( property.isAnnotationPresent( Parent.class ) ) {
 			if ( propertyHolder.isComponent() ) {
@@ -1256,7 +1254,7 @@
 						"@IdClass class should not have @Id nor @EmbeddedId properties"
 				);
 			}
-			log.debug( inferredData.getPropertyName() + " is an id" );
+			log.debug( "{} is an id", inferredData.getPropertyName() );
 			//clone classGenerator and override with local values
 			HashMap<String, IdGenerator> localGenerators =3D (HashMap<String, IdGen=
erator>) classGenerators.clone();
 			localGenerators.putAll( buildLocalGenerators( property, mappings ) );
@@ -1292,13 +1290,9 @@
 					false,
 					isIdentifierMapper, mappings
 			);
-			if ( log.isDebugEnabled() ) {
-				log.debug(
-						"Bind " + ( isComponent ?
-								"@EmbeddedId" :
-								"@Id" ) + " on " + inferredData.getPropertyName()
-				);
-			}
+			log.debug(
+					"Bind {} on {}", ( isComponent ? "@EmbeddedId" : "@Id" ), inferredDat=
a.getPropertyName()
+			);
 		}
 		else if ( property.isAnnotationPresent( Version.class ) ) {
 			if ( isIdentifierMapper ) {
@@ -1318,7 +1312,7 @@
 								+ propertyHolder.getEntityName()
 				);
 			}
-			log.debug( inferredData.getPropertyName() + " is a version property" );
+			log.debug( "{} is a version property", inferredData.getPropertyName() );
 			RootClass rootClass =3D (RootClass) propertyHolder.getPersistentClass();
 			PropertyBinder propBinder =3D new PropertyBinder();
 			propBinder.setName( inferredData.getPropertyName() );
@@ -1338,9 +1332,8 @@
 			simpleValue.setNullValue( "undefined" );
 			rootClass.setOptimisticLockMode( Versioning.OPTIMISTIC_LOCK_VERSION );
 			log.debug(
-					"Version name: " + rootClass.getVersion().getName() + ", unsavedValue=
: " + ( (SimpleValue) rootClass
-							.getVersion()
-							.getValue() ).getNullValue()
+					"Version name: {}, unsavedValue: {}", rootClass.getVersion().getName(=
),
+					( (SimpleValue) rootClass.getVersion().getValue() ).getNullValue()
 			);
 		}
 		else if ( property.isAnnotationPresent( ManyToOne.class ) ) {
@@ -1812,7 +1805,7 @@
 		}
 		comp.setNodeName( inferredData.getPropertyName() );
 		String subpath =3D StringHelper.qualify( propertyHolder.getPath(), infer=
redData.getPropertyName() );
-		log.debug( "Binding component with path: " + subpath );
+		log.debug( "Binding component with path: {}", subpath );
 		PropertyHolder subHolder =3D PropertyHolderBuilder.buildPropertyHolder(
 				comp, subpath,
 				inferredData, propertyHolder, mappings
@@ -2066,7 +2059,7 @@
 	) {
 		//column.getTable() =3D> persistentClass.getTable()
 		final String propertyName =3D inferredData.getPropertyName();
-		log.debug( "Fetching " + propertyName + " with " + fetchMode );
+		log.debug( "Fetching {} with {}", propertyName, fetchMode );
 		boolean mapToPK =3D true;
 		if ( !trueOneToOne ) {
 			//try to find a hidden true one to one (FK =3D=3D PK columns)
@@ -2313,8 +2306,8 @@
 					final boolean mixingStrategy =3D state.type !=3D null && !state.type.=
equals( superclassState.type );
 					if ( nonDefault && mixingStrategy ) {
 						log.warn(
-								"Mixing inheritance strategy in a entity hierarchy is not allowed,=
 ignoring sub strategy in: " + clazz
-										.getName()
+								"Mixing inheritance strategy in a entity hierarchy is not allowed,=
 ignoring sub strategy in: {}",
+								clazz.getName()
 						);
 					}
 					state.type =3D superclassState.type;

Modified: annotations/trunk/src/java/org/hibernate/cfg/AnnotationConfigurat=
ion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/AnnotationConfiguration.ja=
va	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/AnnotationConfiguration.ja=
va	2008-05-17 12:49:38 UTC (rev 14671)
@@ -6,6 +6,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -20,13 +21,9 @@
 import java.util.SortedSet;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
-import java.net.URL;
-
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -34,21 +31,17 @@
 import org.dom4j.io.SAXReader;
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
-import org.hibernate.Interceptor;
 import org.hibernate.annotations.AnyMetaDef;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.cfg.annotations.Version;
 import org.hibernate.cfg.annotations.reflection.EJB3ReflectionManager;
 import org.hibernate.cfg.search.SearchConfiguration;
-import org.hibernate.event.PostDeleteEventListener;
-import org.hibernate.event.PostInsertEventListener;
-import org.hibernate.event.PostUpdateEventListener;
 import org.hibernate.event.PreInsertEventListener;
 import org.hibernate.event.PreUpdateEventListener;
-import org.hibernate.event.EventListeners;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.PersistentClass;
@@ -59,6 +52,8 @@
 import org.hibernate.util.StringHelper;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Similar to the {@link Configuration} object but handles EJB3 and Hibern=
ate
@@ -67,7 +62,7 @@
  * @author Emmanuel Bernard
  */
 public class AnnotationConfiguration extends Configuration {
-	private static Log log =3D LogFactory.getLog( AnnotationConfiguration.cla=
ss );
+	private Logger log =3D LoggerFactory.getLogger( AnnotationConfiguration.c=
lass );
 =

 	static {
 		Version.touch(); //touch version
@@ -167,7 +162,7 @@
 	 * @return the configuration object
 	 */
 	public AnnotationConfiguration addPackage(String packageName) throws Mapp=
ingException {
-		log.info( "Mapping package " + packageName );
+		log.info( "Mapping package {}", packageName );
 		try {
 			AnnotationBinder.bindPackage( packageName, createExtendedMappings() );
 			return this;
@@ -537,7 +532,7 @@
 			annotatedClassEntities.clear();
 		}
 		else {
-			log.warn( "Unknown artifact: " + artifact );
+			log.warn( "Unknown artifact: {}",  artifact );
 		}
 	}
 =

@@ -613,24 +608,24 @@
 		Attribute pckg =3D subelement.attribute( "package" );
 		Attribute clazz =3D subelement.attribute( "class" );
 		if ( rsrc !=3D null ) {
-			log.debug( name + "<-" + rsrc );
+			log.debug( "{} <- {}", name, rsrc );
 			addResource( rsrc.getValue() );
 		}
 		else if ( jar !=3D null ) {
-			log.debug( name + "<-" + jar );
+			log.debug( "{} <- {}", name, jar );
 			addJar( new File( jar.getValue() ) );
 		}
 		else if ( file !=3D null ) {
-			log.debug( name + "<-" + file );
+			log.debug(  "{} <- {}", name, file );
 			addFile( file.getValue() );
 		}
 		else if ( pckg !=3D null ) {
-			log.debug( name + "<-" + pckg );
+			log.debug(  "{} <- {}", name, pckg );
 			addPackage( pckg.getValue() );
 		}
 		else if ( clazz !=3D null ) {
-			log.debug( name + "<-" + clazz );
-			Class loadedClass =3D null;
+			log.debug(  "{} <- {}", name, clazz );
+			Class loadedClass;
 			try {
 				loadedClass =3D ReflectHelper.classForName( clazz.getValue() );
 			}

Modified: annotations/trunk/src/java/org/hibernate/cfg/BinderHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/BinderHelper.java	2008-05-=
17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/BinderHelper.java	2008-05-=
17 12:49:38 UTC (rev 14671)
@@ -12,8 +12,6 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -42,6 +40,8 @@
 import org.hibernate.mapping.Value;
 import org.hibernate.type.TypeFactory;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
@@ -49,7 +49,7 @@
 public class BinderHelper {
 =

 	public static final String ANNOTATION_STRING_DEFAULT =3D "";
-	private static Log log =3D LogFactory.getLog( BinderHelper.class );
+	private static Logger log =3D LoggerFactory.getLogger( BinderHelper.class=
 );
 =

 	private BinderHelper() {
 	}
@@ -550,7 +550,7 @@
 =

 	private static void bindAnyMetaDef(AnyMetaDef defAnn, ExtendedMappings ma=
ppings) {
 		if ( isDefault( defAnn.name() ) ) return; //don't map not named definiti=
ons
-		if ( log.isInfoEnabled() ) log.info( "Binding Any Meta definition: " + d=
efAnn.name() );
+		log.info( "Binding Any Meta definition: {}", defAnn.name() );
 		mappings.addAnyMetaDef( defAnn );
 	}
 }

Modified: annotations/trunk/src/java/org/hibernate/cfg/EJB3DTDEntityResolve=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java=
	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java=
	2008-05-17 12:49:38 UTC (rev 14671)
@@ -3,11 +3,11 @@
 =

 import java.io.InputStream;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.util.DTDEntityResolver;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
@@ -15,7 +15,7 @@
 public class EJB3DTDEntityResolver extends DTDEntityResolver {
 	public static final EntityResolver INSTANCE =3D new EJB3DTDEntityResolver=
();
 =

-	private static final Log log =3D LogFactory.getLog( EJB3DTDEntityResolver=
.class );
+	private final Logger log =3D LoggerFactory.getLogger( EJB3DTDEntityResolv=
er.class );
 =

 	boolean resolved =3D false;
 =

@@ -34,10 +34,10 @@
 					String path =3D "org/hibernate/ejb/" + "orm_1_0.xsd";
 					InputStream dtdStream =3D resolveInHibernateNamespace( path );
 					if ( dtdStream =3D=3D null ) {
-						log.debug( "unable to locate [" + systemId + "] on classpath" );
+						log.debug( "unable to locate [{}] on classpath", systemId );
 					}
 					else {
-						log.debug( "located [" + systemId + "] in classpath" );
+						log.debug( "located [{}] in classpath", systemId );
 						InputSource source =3D new InputSource( dtdStream );
 						source.setPublicId( publicId );
 						source.setSystemId( systemId );
@@ -52,10 +52,10 @@
 					String path =3D "org/hibernate/ejb/" + "persistence_1_0.xsd";
 					InputStream dtdStream =3D resolveInHibernateNamespace( path );
 					if ( dtdStream =3D=3D null ) {
-						log.debug( "unable to locate [" + systemId + "] on classpath" );
+						log.debug( "unable to locate [{}] on classpath", systemId );
 					}
 					else {
-						log.debug( "located [" + systemId + "] in classpath" );
+						log.debug( "located [{}] in classpath", systemId );
 						InputSource source =3D new InputSource( dtdStream );
 						source.setPublicId( publicId );
 						source.setSystemId( systemId );

Modified: annotations/trunk/src/java/org/hibernate/cfg/Ejb3Column.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/Ejb3Column.java	2008-05-17=
 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/Ejb3Column.java	2008-05-17=
 12:49:38 UTC (rev 14671)
@@ -3,8 +3,6 @@
 =

 import java.util.Map;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.Index;
@@ -15,6 +13,8 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.util.StringHelper;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * Wrap state of an EJB3 @Column annotation
@@ -23,7 +23,7 @@
  * @author Emmanuel Bernard
  */
 public class Ejb3Column {
-	private static final Log log =3D LogFactory.getLog( Ejb3Column.class );
+	private static final Logger log =3D LoggerFactory.getLogger( Ejb3Column.c=
lass );
 	private Column mappingColumn;
 	private boolean insertable =3D true;
 	private boolean updatable =3D true;
@@ -150,7 +150,7 @@
 =

 	public void bind() {
 		if ( StringHelper.isNotEmpty( formulaString ) ) {
-			log.debug( "binding formula " + formulaString );
+			log.debug( "binding formula {}", formulaString );
 			formula =3D new Formula();
 			formula.setFormula( formulaString );
 		}
@@ -158,7 +158,7 @@
 			initMappingColumn(
 					logicalColumnName, propertyName, length, precision, scale, nullable, =
sqlType, unique, true
 			);
-			log.debug( "Binding column " + mappingColumn.getName() + " unique " + u=
nique );
+			log.debug( "Binding column {}. Unique {}", mappingColumn.getName(), uni=
que );
 		}
 	}
 =

@@ -336,7 +336,7 @@
 					throw new AnnotationException( "AttributeOverride.column() should ove=
rride all columns for now" );
 				}
 				actualCols =3D overriddenCols.length =3D=3D 0 ? null : overriddenCols;
-				log.debug( "Column(s) overridden for property " + inferredData.getProp=
ertyName() );
+				log.debug( "Column(s) overridden for property {}", inferredData.getPro=
pertyName() );
 			}
 			if ( actualCols =3D=3D null ) {
 				columns =3D buildImplicitColumn( inferredData, secondaryTables, proper=
tyHolder, nullability, mappings );

Modified: annotations/trunk/src/java/org/hibernate/cfg/ExtendedMappings.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/ExtendedMappings.java	2008=
-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/ExtendedMappings.java	2008=
-05-17 12:49:38 UTC (rev 14671)
@@ -10,8 +10,6 @@
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.AnyMetaDef;
@@ -24,6 +22,8 @@
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * Allow annotation related mappings
@@ -34,7 +34,7 @@
  */
 public class ExtendedMappings extends Mappings {
 =

-	private static final Log log =3D LogFactory.getLog( ExtendedMappings.clas=
s );
+	private final Logger log =3D LoggerFactory.getLogger( ExtendedMappings.cl=
ass );
 =

 	private final Map<String, IdGenerator> namedGenerators;
 	private final Map<String, Map<String, Join>> joins;
@@ -102,13 +102,13 @@
 	public void addGenerator(IdGenerator generator) throws MappingException {
 		if ( !defaultNamedGenerators.contains( generator.getName() ) ) {
 			Object old =3D namedGenerators.put( generator.getName(), generator );
-			if ( old !=3D null ) log.warn( "duplicate generator name: " + generator=
.getName() );
+			if ( old !=3D null ) log.warn( "duplicate generator name: {}", generato=
r.getName() );
 		}
 	}
 =

 	public void addJoins(PersistentClass persistentClass, Map<String, Join> j=
oins) throws MappingException {
 		Object old =3D this.joins.put( persistentClass.getEntityName(), joins );
-		if ( old !=3D null ) log.warn( "duplicate joins for class: " + persisten=
tClass.getEntityName() );
+		if ( old !=3D null ) log.warn( "duplicate joins for class: {}", persiste=
ntClass.getEntityName() );
 	}
 =

 	public AnnotatedClassType addClassType(XClass clazz) {
@@ -169,7 +169,7 @@
 =

 	public void addGeneratorTable(String name, Properties params) {
 		Object old =3D generatorTables.put( name, params );
-		if ( old !=3D null ) log.warn( "duplicate generator table: " + name );
+		if ( old !=3D null ) log.warn( "duplicate generator table: {}", name );
 	}
 =

 	public Properties getGeneratorTableProperties(String name, Map<String, Pr=
operties> localGeneratorTables) {

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Collecti=
onBinder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBind=
er.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/CollectionBind=
er.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -16,8 +16,6 @@
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.FetchMode;
@@ -81,6 +79,8 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Collection binder
@@ -90,7 +90,7 @@
  */
 public abstract class CollectionBinder {
 =

-	private static final Log log =3D LogFactory.getLog( CollectionBinder.clas=
s );
+	private Logger log =3D LoggerFactory.getLogger( CollectionBinder.class );
 =

 	protected Collection collection;
 	protected String propertyName;
@@ -307,7 +307,7 @@
 =

 	public void bind() {
 		this.collection =3D createCollection( propertyHolder.getPersistentClass(=
) );
-		log.debug( "Collection role: " + StringHelper.qualify( propertyHolder.ge=
tPath(), propertyName ) );
+		log.debug( "Collection role: {}", StringHelper.qualify( propertyHolder.g=
etPath(), propertyName ) );
 		collection.setRole( StringHelper.qualify( propertyHolder.getPath(), prop=
ertyName ) );
 		collection.setNodeName( propertyName );
 =

@@ -617,11 +617,8 @@
 			XClass collectionType,
 			boolean cascadeDeleteEnabled, boolean ignoreNotFound, String hqlOrderBy=
, ExtendedMappings extendedMappings
 	) {
-		if ( log.isDebugEnabled() ) {
-			log.debug(
-					"Binding a OneToMany: " + propertyHolder.getEntityName() + "." + prop=
ertyName + " through a foreign key"
-			);
-		}
+
+		log.debug("Binding a OneToMany: {}.{} through a foreign key", propertyHo=
lder.getEntityName(), propertyName);
 		org.hibernate.mapping.OneToMany oneToMany =3D new org.hibernate.mapping.=
OneToMany( collection.getOwner() );
 		collection.setElement( oneToMany );
 		oneToMany.setReferencedEntityName( collectionType.getName() );
@@ -1049,16 +1046,16 @@
 		if ( log.isDebugEnabled() ) {
 			String path =3D collValue.getOwnerEntityName() + "." + joinColumns[0].g=
etPropertyName();
 			if ( isCollectionOfEntities && unique ) {
-				log.debug( "Binding a OneToMany: " + path + " through an association t=
able" );
+				log.debug( "Binding a OneToMany: {} through an association table", pat=
h );
 			}
 			else if ( isCollectionOfEntities ) {
-				log.debug( "Binding as ManyToMany: " + path );
+				log.debug( "Binding as ManyToMany: {}", path );
 			}
 			else if ( anyAnn !=3D null ) {
-				log.debug( "Binding a ManyToAny: " + path );
+				log.debug( "Binding a ManyToAny: {}", path );
 			}
 			else {
-				log.debug( "Binding a collection of element: " + path );
+				log.debug( "Binding a collection of element: {}", path );
 			}
 		}
 		//check for user error

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/EntityBi=
nder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/EntityBinder.j=
ava	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/EntityBinder.j=
ava	2008-05-17 12:49:38 UTC (rev 14671)
@@ -14,8 +14,6 @@
 import javax.persistence.SecondaryTables;
 import javax.persistence.UniqueConstraint;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
@@ -61,6 +59,8 @@
 import org.hibernate.mapping.Value;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Stateful holder and processor for binding Entity information
@@ -72,7 +72,7 @@
 	private XClass annotatedClass;
 	private PersistentClass persistentClass;
 	private ExtendedMappings mappings;
-	private static Log log =3D LogFactory.getLog( EntityBinder.class );
+	private Logger log =3D LoggerFactory.getLogger( EntityBinder.class );
 	private String discriminatorValue =3D "";
 	private boolean isPropertyAnnotated =3D false;
 	private boolean dynamicInsert;
@@ -192,12 +192,12 @@
 		}
 		else {
 			if ( explicitHibernateEntityAnnotation ) {
-				log.warn( "@org.hibernate.annotations.Entity used on a non root entity=
: ignored for "
-						+ annotatedClass.getName() );
+				log.warn( "@org.hibernate.annotations.Entity used on a non root entity=
: ignored for {}",
+						annotatedClass.getName() );
 			}
 			if ( annotatedClass.isAnnotationPresent( Immutable.class ) ) {
-				log.warn( "@Immutable used on a non root entity: ignored for "
-						+ annotatedClass.getName() );
+				log.warn( "@Immutable used on a non root entity: ignored for {}",
+						annotatedClass.getName() );
 			}
 		}
 		persistentClass.setOptimisticLockMode( getVersioning( optimisticLockType=
 ) );
@@ -289,10 +289,10 @@
 		}
 		else {
 			if ( filters.size() > 0 ) {
-				log.warn( "@Filter not allowed on subclasses (ignored): " + persistent=
Class.getEntityName() );
+				log.warn( "@Filter not allowed on subclasses (ignored): {}", persisten=
tClass.getEntityName() );
 			}
 		}
-		log.debug( "Import with entity name=3D" + name );
+		log.debug( "Import with entity name {}", name );
 		try {
 			mappings.addImport( persistentClass.getEntityName(), name );
 			String entityName =3D persistentClass.getEntityName();
@@ -419,9 +419,7 @@
 		);
 =

 		if ( persistentClass instanceof TableOwner ) {
-			if ( log.isInfoEnabled() ) {
-				log.info( "Bind entity " + persistentClass.getEntityName() + " on tabl=
e " + table.getName() );
-			}
+			log.info( "Bind entity {} on table {}", persistentClass.getEntityName()=
, table.getName() );
 			( (TableOwner) persistentClass ).setTable( table );
 		}
 		else {
@@ -630,12 +628,9 @@
 		else if ( joinTable !=3D null ) {
 			joinColumns =3D joinTable.joinColumns();
 		}
-		if ( log.isInfoEnabled() ) {
-			log.info(
-					"Adding secondary table to entity " + persistentClass.getEntityName()=
 + " -> " + join.getTable()
-							.getName()
-			);
-		}
+		log.info(
+				"Adding secondary table to entity {} -> {}", persistentClass.getEntity=
Name(), join.getTable().getName()
+		);
 =

 		org.hibernate.annotations.Table matchingTable =3D findMatchingCompliment=
TableAnnotation( join );
 		if ( matchingTable !=3D null ) {

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/ListBind=
er.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/ListBinder.jav=
a	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/ListBinder.jav=
a	2008-05-17 12:49:38 UTC (rev 14671)
@@ -2,8 +2,6 @@
 =

 import java.util.Map;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.OrderBy;
@@ -24,6 +22,8 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Bind a list
@@ -32,7 +32,7 @@
  * @author Emmanuel Bernard
  */
 public class ListBinder extends CollectionBinder {
-	private static Log log =3D LogFactory.getLog( ListBinder.class );
+	private Logger log =3D LoggerFactory.getLogger( ListBinder.class );
 =

 	public ListBinder() {
 	}

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Property=
Binder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/PropertyBinder=
.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/PropertyBinder=
.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -4,8 +4,6 @@
 import javax.persistence.EmbeddedId;
 import javax.persistence.Id;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.GenerationTime;
@@ -21,12 +19,14 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Value;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class PropertyBinder {
-	private static Log log =3D LogFactory.getLog( PropertyBinder.class );
+	private Logger log =3D LoggerFactory.getLogger( PropertyBinder.class );
 	private String name;
 	private String returnedClassName;
 	private boolean lazy;
@@ -103,9 +103,7 @@
 =

 	public Property bind() {
 		validateBind();
-		if ( log.isDebugEnabled() ) {
-			log.debug( "binding property " + name + " with lazy=3D" + lazy );
-		}
+		log.debug( "binding property {} with lazy=3D{}", name, lazy );
 		String containerClassName =3D holder =3D=3D null ?
 				null :
 				holder.getClassName();

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/QueryBin=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/QueryBinder.ja=
va	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/QueryBinder.ja=
va	2008-05-17 12:49:38 UTC (rev 14671)
@@ -10,8 +10,6 @@
 import javax.persistence.SqlResultSetMapping;
 import javax.persistence.SqlResultSetMappings;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
@@ -26,6 +24,8 @@
 import org.hibernate.engine.NamedSQLQueryDefinition;
 import org.hibernate.engine.query.sql.NativeSQLQueryReturn;
 import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Query binder
@@ -33,7 +33,7 @@
  * @author Emmanuel Bernard
  */
 public abstract class QueryBinder {
-	private static Log log =3D LogFactory.getLog( QueryBinder.class );
+	private static final Logger log =3D LoggerFactory.getLogger( QueryBinder.=
class );
 =

 	public static void bindQuery(NamedQuery queryAnn, ExtendedMappings mappin=
gs, boolean isDefault) {
 		if ( queryAnn =3D=3D null ) return;
@@ -61,7 +61,7 @@
 		else {
 			mappings.addQuery( queryAnn.name(), query );
 		}
-		if ( log.isInfoEnabled() ) log.info( "Binding Named query: " + queryAnn.=
name() + " =3D> " + queryAnn.query() );
+		log.info( "Binding Named query: {} =3D> {}", queryAnn.name(), queryAnn.q=
uery() );
 	}
 =

 =

@@ -123,9 +123,7 @@
 		else {
 			mappings.addSQLQuery( queryAnn.name(), query );
 		}
-		if ( log.isInfoEnabled() ) {
-			log.info( "Binding named native query: " + queryAnn.name() + " =3D> " +=
 queryAnn.query() );
-		}
+		log.info( "Binding named native query: {} =3D> {}", queryAnn.name(), que=
ryAnn.query() );
 	}
 =

 	public static void bindNativeQuery(org.hibernate.annotations.NamedNativeQ=
uery queryAnn, ExtendedMappings mappings) {
@@ -179,9 +177,7 @@
 			throw new NotYetImplementedException( "Pure native scalar queries are n=
ot yet supported" );
 		}
 		mappings.addSQLQuery( queryAnn.name(), query );
-		if ( log.isInfoEnabled() ) {
-			log.info( "Binding named native query: " + queryAnn.name() + " =3D> " +=
 queryAnn.query() );
-		}
+		log.info( "Binding named native query: {} =3D> {}", queryAnn.name(), que=
ryAnn.query() );
 	}
 =

 	public static void bindQueries(NamedQueries queriesAnn, ExtendedMappings =
mappings, boolean isDefault) {

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Resultse=
tMappingSecondPass.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/ResultsetMappi=
ngSecondPass.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/ResultsetMappi=
ngSecondPass.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -13,8 +13,6 @@
 import javax.persistence.FieldResult;
 import javax.persistence.SqlResultSetMapping;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.cfg.BinderHelper;
@@ -30,12 +28,14 @@
 import org.hibernate.mapping.Value;
 import org.hibernate.util.CollectionHelper;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class ResultsetMappingSecondPass implements QuerySecondPass {
-	private static Log log =3D LogFactory.getLog( ResultsetMappingSecondPass.=
class );
+	private Logger log =3D LoggerFactory.getLogger( ResultsetMappingSecondPas=
s.class );
 	private SqlResultSetMapping ann;
 	private ExtendedMappings mappings;
 	private boolean isDefault;
@@ -50,7 +50,7 @@
 		//TODO add parameters checkings
 		if ( ann =3D=3D null ) return;
 		ResultSetMappingDefinition definition =3D new ResultSetMappingDefinition=
( ann.name() );
-		if ( log.isInfoEnabled() ) log.info( "Binding resultset mapping: " + def=
inition.getName() );
+		log.info( "Binding resultset mapping: {}", definition.getName() );
 =

 		int entityAliasIndex =3D 0;
 =


Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/SetBinde=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/SetBinder.java=
	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/SetBinder.java=
	2008-05-17 12:49:38 UTC (rev 14671)
@@ -1,11 +1,11 @@
 package org.hibernate.cfg.annotations;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.annotations.OrderBy;
 import org.hibernate.cfg.Environment;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.PersistentClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Bind a set.
@@ -13,7 +13,7 @@
  * @author Matthew Inger
  */
 public class SetBinder extends CollectionBinder {
-	private static Log log =3D LogFactory.getLog( SetBinder.class );
+	private final Logger log =3D LoggerFactory.getLogger( SetBinder.class );
 =

 	public SetBinder() {
 	}

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/SimpleVa=
lueBinder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/SimpleValueBin=
der.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/SimpleValueBin=
der.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -10,8 +10,6 @@
 import javax.persistence.Lob;
 import javax.persistence.Temporal;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.Parameter;
@@ -32,12 +30,14 @@
 import org.hibernate.type.SerializableToBlobType;
 import org.hibernate.type.StringClobType;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class SimpleValueBinder {
-	private static Log log =3D LogFactory.getLog( SimpleValueBinder.class );
+	private Logger log =3D LoggerFactory.getLogger( SimpleValueBinder.class );
 	private String propertyName;
 	private String returnedClassName;
 	private Ejb3Column[] columns;
@@ -217,7 +217,7 @@
 =

 	public SimpleValue make() {
 		validate();
-		log.debug( "building SimpleValue for " + propertyName );
+		log.debug( "building SimpleValue for {}", propertyName );
 		if ( table =3D=3D null ) {
 			table =3D columns[0].getTable();
 		}

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/TableBin=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/TableBinder.ja=
va	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/TableBinder.ja=
va	2008-05-17 12:49:38 UTC (rev 14671)
@@ -6,8 +6,6 @@
 import java.util.List;
 import javax.persistence.UniqueConstraint;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.Index;
@@ -26,6 +24,8 @@
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Table related operations
@@ -34,7 +34,7 @@
  */
 public class TableBinder {
 	//TODO move it to a getter/setter strategy
-	private static Log log =3D LogFactory.getLog( TableBinder.class );
+	private static Logger log =3D LoggerFactory.getLogger( TableBinder.class =
);
 	private String schema;
 	private String catalog;
 	private String name;
@@ -181,11 +181,7 @@
 			 * Get the columns of the mapped-by property
 			 * copy them and link the copy to the actual value
 			 */
-			if ( log.isDebugEnabled() ) {
-				log.debug(
-						"Retrieving property " + associatedClass.getEntityName() + "." + map=
pedByProperty
-				);
-			}
+			log.debug("Retrieving property {}.{}", associatedClass.getEntityName(),=
 mappedByProperty);
 =

 			final Property property =3D associatedClass.getRecursiveProperty( colum=
ns[0].getMappedBy() );
 			Iterator mappedByColumns;

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2=
008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2=
008-05-17 12:49:38 UTC (rev 14671)
@@ -1,18 +1,18 @@
 //$Id: $
 package org.hibernate.cfg.annotations;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class Version {
 	public static final String VERSION =3D "3.3.1.GA";
-	private static Log log =3D LogFactory.getLog( Version.class );
+	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {
-		log.info( "Hibernate Annotations " + VERSION );
+		log.info( "Hibernate Annotations {}", VERSION );
 	}
 =

 	public static void touch() {

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/reflecti=
on/EJB3OverridenAnnotationReader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/EJB=
3OverridenAnnotationReader.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/EJB=
3OverridenAnnotationReader.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -80,8 +80,6 @@
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.dom4j.Attribute;
 import org.dom4j.Element;
 import org.hibernate.AnnotationException;
@@ -95,6 +93,8 @@
 import org.hibernate.annotations.common.reflection.ReflectionUtil;
 import org.hibernate.util.ReflectHelper;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Encapsulates the overriding of Java annotations from an EJB 3.0 descrip=
tor.
@@ -104,7 +104,7 @@
  * @author Emmanuel Bernard
  */
 public class EJB3OverridenAnnotationReader implements AnnotationReader {
-	private static Log log =3D LogFactory.getLog( EJB3OverridenAnnotationRead=
er.class );
+	private Logger log =3D LoggerFactory.getLogger( EJB3OverridenAnnotationRe=
ader.class );
 	private static final Map<Class, String> annotationToXml;
 	private static final String SCHEMA_VALIDATION =3D "Activate schema valida=
tion for more informations";
 	private static final Filter FILTER =3D new Filter() {
@@ -391,8 +391,9 @@
 			for (Element subelement : (List<Element>) element.elements()) {
 				String propertyName =3D subelement.attributeValue( "name" );
 				if ( !properties.contains( propertyName ) ) {
-					log.warn( "Property " + StringHelper.qualify( className, propertyName=
 ) + " not found in class"
-							+ " but described in <mapping-file/> (possible typo error)" );
+					log.warn( "Property {} not found in class"
+							+ " but described in <mapping-file/> (possible typo error)",
+							StringHelper.qualify( className, propertyName ) );
 				}
 			}
 		}

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/reflecti=
on/XMLContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/XML=
Context.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/reflection/XML=
Context.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -6,17 +6,17 @@
 import java.util.List;
 import java.util.Map;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.hibernate.util.StringHelper;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class XMLContext {
-	private static Log log =3D LogFactory.getLog( XMLContext.class );
+	private Logger log =3D LoggerFactory.getLogger( XMLContext.class );
 	private Default globalDefaults;
 	private Map<String, Element> classOverriding =3D new HashMap<String, Elem=
ent>();
 	private Map<String, Default> defaultsOverriding =3D new HashMap<String, D=
efault>();
@@ -102,7 +102,7 @@
 			if ( access !=3D null ) localDefault.setAccess( access );
 			defaultsOverriding.put( className, localDefault );
 =

-			log.debug( "Adding XML overriding information for " + className );
+			log.debug( "Adding XML overriding information for {}", className );
 			addEntityListenerClasses( element, packageName, addedClasses );
 		}
 	}
@@ -118,8 +118,8 @@
 					//maybe switch it to warn?
 					if ( "entity-listener".equals( classOverriding.get( listenerClassName=
 ).getName() ) ) {
 						log.info(
-								"entity-listener duplication, first event definition will be used:=
 "
-										+ listenerClassName
+								"entity-listener duplication, first event definition will be used:=
 {}",
+								listenerClassName
 						);
 						continue;
 					}
@@ -131,7 +131,7 @@
 				classOverriding.put( listenerClassName, listener );
 			}
 		}
-		log.debug( "Adding XML overriding information for listener: " + listener=
s );
+		log.debug( "Adding XML overriding information for listener: {}", listene=
rs );
 		addedClasses.addAll( localAddedClasses );
 		return localAddedClasses;
 	}

Modified: annotations/trunk/src/java/org/hibernate/cfg/search/SearchConfigu=
ration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/search/SearchConfiguration=
.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/cfg/search/SearchConfiguration=
.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -10,8 +10,8 @@
 import org.hibernate.event.PostUpdateEventListener;
 import org.hibernate.event.PostDeleteEventListener;
 import org.hibernate.event.EventListeners;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * Helper methods initializing Hibernate Search event listeners
@@ -19,7 +19,7 @@
  * @author Emmanuel Bernard
  */
 public class SearchConfiguration {
-	private static Log log =3D LogFactory.getLog( SearchConfiguration.class );
+	private static final Logger log =3D LoggerFactory.getLogger( SearchConfig=
uration.class );
 =

 	public static void enableHibernateSearch(EventListeners eventListeners, P=
roperties properties) {
 		//add search events if the jar is available

Modified: annotations/trunk/src/java/org/hibernate/type/EnumType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/type/EnumType.java	2008-05-17 =
12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/java/org/hibernate/type/EnumType.java	2008-05-17 =
12:49:38 UTC (rev 14671)
@@ -13,14 +13,14 @@
 import java.util.Map;
 import java.util.Properties;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.usertype.EnhancedUserType;
 import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.util.ReflectHelper;
-import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Enum type mapper
@@ -30,12 +30,22 @@
  */
 //TODO implements readobject/writeobject to recalculate the enumclasses
 public class EnumType implements EnhancedUserType, ParameterizedType, Seri=
alizable {
-	private static Log log =3D LogFactory.getLog( EnumType.class );
-	private static final boolean IS_TRACE_ENABLED;
+	/**
+	 * This is the old scheme where logging of parameter bindings and value e=
xtractions
+	 * was controlled by the trace level enablement on the 'org.hibernate.typ=
e' package...
+	 * <p/>
+	 * Originally was cached such because of performance of looking up the lo=
gger each time
+	 * in order to check the trace-enablement.  Driving this via a central Lo=
g-specific class
+	 * would alleviate that performance hit, and yet still allow more "normal=
" logging usage/config.
+	 */
+	private static final boolean IS_VALUE_TRACING_ENABLED =3D LoggerFactory.g=
etLogger( StringHelper.qualifier( Type.class.getName() ) ).isTraceEnabled();
+	private transient Logger log;
 =

-	static {
-		//cache this, because it was a significant performance cost
-		IS_TRACE_ENABLED =3D LogFactory.getLog( StringHelper.qualifier( Type.cla=
ss.getName() ) ).isTraceEnabled();
+	private Logger log() {
+		if ( log =3D=3D null ) {
+			log =3D LoggerFactory.getLogger( getClass() );
+		}
+		return log;
 	}
 =

 	public static final String ENUM =3D "enumClass";
@@ -74,8 +84,8 @@
 	public Object nullSafeGet(ResultSet rs, String[] names, Object owner) thr=
ows HibernateException, SQLException {
 		Object object =3D rs.getObject( names[0] );
 		if ( rs.wasNull() ) {
-			if ( IS_TRACE_ENABLED ) {
-				log.debug( "Returning null as column " + names[0] );
+			if ( IS_VALUE_TRACING_ENABLED ) {
+				log().debug( "Returning null as column {}", names[0] );
 			}
 			return null;
 		}
@@ -86,15 +96,15 @@
 			if ( ordinal < 0 || ordinal >=3D values.length ) {
 				throw new IllegalArgumentException( "Unknown ordinal value for enum " =
+ enumClass + ": " + ordinal );
 			}
-			if ( IS_TRACE_ENABLED ) {
-				log.debug( "Returning '" + ordinal + "' as column " + names[0] );
+			if ( IS_VALUE_TRACING_ENABLED ) {
+				log().debug( "Returning '{}' as column {}", ordinal, names[0] );
 			}
 			return values[ordinal];
 		}
 		else {
 			String name =3D (String) object;
-			if ( IS_TRACE_ENABLED ) {
-				log.debug( "Returning '" + name + "' as column " + names[0] );
+			if ( IS_VALUE_TRACING_ENABLED ) {
+				log().debug( "Returning '{}' as column {}", name, names[0] );
 			}
 			try {
 				return Enum.valueOf( enumClass, name );
@@ -108,22 +118,22 @@
 	public void nullSafeSet(PreparedStatement st, Object value, int index) th=
rows HibernateException, SQLException {
 		//if (!guessed) guessType( st, index );
 		if ( value =3D=3D null ) {
-			if ( IS_TRACE_ENABLED ) log.debug( "Binding null to parameter: " + inde=
x );
+			if ( IS_VALUE_TRACING_ENABLED ) log().debug( "Binding null to parameter=
: {}", index );
 			st.setNull( index, sqlType );
 		}
 		else {
 			boolean isOrdinal =3D isOrdinal( sqlType );
 			if ( isOrdinal ) {
 				int ordinal =3D ( (Enum) value ).ordinal();
-				if ( IS_TRACE_ENABLED ) {
-					log.debug( "Binding '" + ordinal + "' to parameter: " + index );
+				if ( IS_VALUE_TRACING_ENABLED ) {
+					log().debug( "Binding '{}' to parameter: {}", ordinal, index );
 				}
 				st.setObject( index, Integer.valueOf( ordinal ), sqlType );
 			}
 			else {
 				String enumString =3D ( (Enum) value ).name();
-				if ( IS_TRACE_ENABLED ) {
-					log.debug( "Binding '" + enumString + "' to parameter: " + index );
+				if ( IS_VALUE_TRACING_ENABLED ) {
+					log().debug( "Binding '{}' to parameter: {}", enumString, index );
 				}
 				st.setObject( index, enumString, sqlType );
 			}

Modified: annotations/trunk/src/test/org/hibernate/test/annotations/reflect=
ion/LogListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Lo=
gListener.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Lo=
gListener.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -4,23 +4,24 @@
 import javax.persistence.PrePersist;
 import javax.persistence.PostPersist;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

+
 /**
  * @author Emmanuel Bernard
  */
 public class LogListener {
-	Log log =3D LogFactory.getLog( LogListener.class );
+	private final Logger log =3D LoggerFactory.getLogger( LogListener.class );
 =

 	@PrePersist
 	@PostPersist
 	public void log(Object entity) {
-		log.debug( "Logging entity " +  entity.getClass().getName() + " with has=
hCode: " + entity.hashCode() );
+		log.debug( "Logging entity {} with hashCode: {}", entity.getClass().getN=
ame(), entity.hashCode() );
 	}
 =

 =

 	public void noLog(Object entity) {
-		log.debug( "NoLogging entity " +  entity.getClass().getName() + " with h=
ashCode: " + entity.hashCode() );
+		log.debug( "NoLogging entity {} with hashCode: {}", entity.getClass().ge=
tName(), entity.hashCode() );
 	}
 }

Modified: annotations/trunk/src/test/org/hibernate/test/annotations/reflect=
ion/OtherLogListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Ot=
herLogListener.java	2008-05-17 12:47:32 UTC (rev 14670)
+++ annotations/trunk/src/test/org/hibernate/test/annotations/reflection/Ot=
herLogListener.java	2008-05-17 12:49:38 UTC (rev 14671)
@@ -4,23 +4,24 @@
 import javax.persistence.PrePersist;
 import javax.persistence.PostPersist;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

+
 /**
  * @author Emmanuel Bernard
  */
 public class OtherLogListener {
-	Log log =3D LogFactory.getLog( OtherLogListener.class );
+	private final Logger log =3D LoggerFactory.getLogger( OtherLogListener.cl=
ass );
 =

 	@PrePersist
 	@PostPersist
 	public void log(Object entity) {
-		log.debug( "Logging entity " +  entity.getClass().getName() + " with has=
hCode: " + entity.hashCode() );
+		log.debug( "Logging entity {} with hashCode: {}", entity.getClass().getN=
ame(), entity.hashCode() );
 	}
 =

 =

 	public void noLog(Object entity) {
-		log.debug( "NoLogging entity " +  entity.getClass().getName() + " with h=
ashCode: " + entity.hashCode() );
+		log.debug( "NoLogging entity {} with hashCode: {}", entity.getClass().ge=
tName(), entity.hashCode() );
 	}
 }


--===============8221554846171933715==--

From hibernate-commits at lists.jboss.org Sat May 17 08:50:58 2008
Content-Type: multipart/mixed; boundary="===============2370340026303148050=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14672 - in entitymanager/trunk:
 src/java/org/hibernate/ejb and 5 other directories.
Date: Sat, 17 May 2008 08:50:58 -0400
Message-ID: <E1JxLsI-0006PX-19@committer01.frg.pub.inap.atl.jboss.com>

--===============2370340026303148050==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-17 08:50:57 -0400 (Sat, 17 May 2008)
New Revision: 14672

Modified:
   entitymanager/trunk/ivy.xml
   entitymanager/trunk/pom.xml
   entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImpl=
.java
   entitymanager/trunk/src/java/org/hibernate/ejb/Ejb3Configuration.java
   entitymanager/trunk/src/java/org/hibernate/ejb/EntityManagerImpl.java
   entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
   entitymanager/trunk/src/java/org/hibernate/ejb/connection/InjectedDataSo=
urceConnectionProvider.java
   entitymanager/trunk/src/java/org/hibernate/ejb/event/EJB3PersistEventLis=
tener.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVisi=
tor.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVisi=
tor.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarVi=
sitor.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZipp=
edJarVisitor.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFacto=
ry.java
   entitymanager/trunk/src/java/org/hibernate/ejb/packaging/PersistenceXmlL=
oader.java
   entitymanager/trunk/src/java/org/hibernate/ejb/util/NamingHelper.java
   entitymanager/trunk/src/java/org/hibernate/engine/EJB3CascadingAction.ja=
va
Log:
EJB-359 move to slf4j

Modified: entitymanager/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/ivy.xml	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/ivy.xml	2008-05-17 12:50:57 UTC (rev 14672)
@@ -9,7 +9,7 @@
         <conf name=3D"test" visibility=3D"private" description=3D"Dependen=
cies needed for testing purposes"/>
     </configurations>
     <publications>
-        <artifact name=3D"entitymanager" conf=3D"default"/>
+        <artifact name=3D"hibernate-entitymanager" conf=3D"default"/>
     </publications>
     <dependencies>
 		<!-- compile time dependencies -->
@@ -17,13 +17,13 @@
         <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
         <dependency name=3D"annotations" rev=3D"latest" conf=3D"default->d=
efault"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
-        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"def=
ault->default"/>
         <dependency org=3D"javax.transaction" name=3D"jta" rev=3D"1.1" con=
f=3D"default->default"/>
         <dependency org=3D"javassist" name=3D"javassist" rev=3D"3.4.GA" co=
nf=3D"default->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>
 =

+
         <!-- transitive dependencies -->
-        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/>
         <dependency org=3D"antlr" name=3D"antlr" rev=3D"2.7.6" conf=3D"tes=
t->default"/>
         <dependency org=3D"commons-collections" name=3D"commons-collection=
s" rev=3D"3.1" conf=3D"test->default"/>
 =


Modified: entitymanager/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/pom.xml	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/pom.xml	2008-05-17 12:50:57 UTC (rev 14672)
@@ -42,10 +42,10 @@
 			<version>3.3.0.CR1</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.2</version>
+        </dependency>
         <dependency>
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityMana=
gerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImp=
l.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/AbstractEntityManagerImp=
l.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -27,8 +27,6 @@
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -56,13 +54,15 @@
 import org.hibernate.transaction.TransactionFactory;
 import org.hibernate.util.JTAHelper;
 import org.hibernate.util.CollectionHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author <a href=3D"mailto:gavin(a)hibernate.org">Gavin King</a>
  * @author Emmanuel Bernard
  */
 public abstract class AbstractEntityManagerImpl implements HibernateEntity=
ManagerImplementor, Serializable {
-	private static Log log =3D LogFactory.getLog( AbstractEntityManagerImpl.c=
lass );
+	private static final Logger log =3D LoggerFactory.getLogger( AbstractEnti=
tyManagerImpl.class );
 =

 	protected transient TransactionImpl tx =3D new TransactionImpl( this );
 	protected PersistenceContextType persistenceContextType;
@@ -408,7 +408,7 @@
 		boolean isTransactionActive =3D isTransactionInProgress();
 =

 		if ( isTransactionActive && session.getFlushMode() =3D=3D FlushMode.MANU=
AL ) {
-			log.debug( "Transaction activated, move to FlushMode " + flushModeType =
);
+			log.debug( "Transaction activated, move to FlushMode {}", flushModeType=
 );
 			setFlushMode( flushModeType );
 		}
 		else if ( ! isTransactionActive && session.getFlushMode() !=3D FlushMode=
.MANUAL ) {
@@ -559,7 +559,7 @@
 					);
 				}
 				else {
-					log.warn( "Cannot join transaction: do not override " + Environment.T=
RANSACTION_STRATEGY );
+					log.warn( "Cannot join transaction: do not override {}", Environment.=
TRANSACTION_STRATEGY );
 				}
 			}
 			catch (HibernateException he) {

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Ejb3Configuration.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/Ejb3Configuration.java	2=
008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Ejb3Configuration.java	2=
008-05-17 12:50:57 UTC (rev 14672)
@@ -35,8 +35,6 @@
 import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
@@ -81,6 +79,8 @@
 import org.hibernate.util.XMLHelper;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.SAXException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Allow a fine tuned configuration of an EJB 3.0 EntityManagerFactory
@@ -102,7 +102,7 @@
 public class Ejb3Configuration implements Serializable, Referenceable {
 	private static final String IMPLEMENTATION_NAME =3D HibernatePersistence.=
class.getName();
 	private static final String META_INF_ORM_XML =3D "META-INF/orm.xml";
-	private static Log log =3D LogFactory.getLog( Ejb3Configuration.class );
+	private final Logger log =3D LoggerFactory.getLogger( Ejb3Configuration.c=
lass );
 	private static EntityNotFoundDelegate ejb3EntityNotFoundDelegate =3D new =
Ejb3EntityNotFoundDelegate();
 	private static Configuration DEFAULT_CONFIGURATION =3D new AnnotationConf=
iguration();
 	private String persistenceUnitName;
@@ -155,7 +155,7 @@
 	 * Especially the scanning of classes and additional jars is done already=
 at this point.
 	 */
 	private Ejb3Configuration configure(PersistenceMetadata metadata, Map ove=
rrides) {
-		log.debug( "Creating Factory: " + metadata.getName() );
+		log.debug( "Creating Factory: {}", metadata.getName() );
 =

 		Map workingVars =3D new HashMap();
 		workingVars.put( HibernatePersistence.PERSISTENCE_UNIT_NAME, metadata.ge=
tName() );
@@ -206,7 +206,7 @@
 	 */
 	public Ejb3Configuration configure(String persistenceUnitName, Map integr=
ation) {
 		try {
-			log.debug( "Look up for persistence unit: " + persistenceUnitName );
+			log.debug( "Look up for persistence unit: {}", persistenceUnitName );
 			integration =3D integration =3D=3D null ?
 					CollectionHelper.EMPTY_MAP :
 					Collections.unmodifiableMap( integration );
@@ -218,14 +218,14 @@
 			}
 			while ( xmls.hasMoreElements() ) {
 				URL url =3D xmls.nextElement();
-				log.trace( "Analysing persistence.xml: " + url );
+				log.trace( "Analysing persistence.xml: {}", url );
 				List<PersistenceMetadata> metadataFiles =3D PersistenceXmlLoader.deplo=
y(
 						url,
 						integration,
 						cfg.getEntityResolver(),
 						PersistenceUnitTransactionType.RESOURCE_LOCAL );
 				for ( PersistenceMetadata metadata : metadataFiles ) {
-					log.trace( metadata.toString() );
+					log.trace( "{}", metadata );
 =

 					if ( metadata.getProvider() =3D=3D null || IMPLEMENTATION_NAME.equals=
IgnoreCase(
 							metadata.getProvider()
@@ -309,17 +309,17 @@
 	 */
 	public Ejb3Configuration configure(PersistenceUnitInfo info, Map integrat=
ion) {
 		if ( log.isDebugEnabled() ) {
-			log.debug( "Processing " + LogHelper.logPersistenceUnitInfo( info ) );
+			log.debug( "Processing {}", LogHelper.logPersistenceUnitInfo( info ) );
 		}
 		else {
-			log.info( "Processing PersistenceUnitInfo [\n\tname: " + info.getPersis=
tenceUnitName() + "\n\t...]" );
+			log.info( "Processing PersistenceUnitInfo [\n\tname: {}\n\t...]", info.=
getPersistenceUnitName() );
 		}
 =

 		integration =3D integration !=3D null ? Collections.unmodifiableMap( int=
egration ) : CollectionHelper.EMPTY_MAP;
 		String provider =3D (String) integration.get( HibernatePersistence.PROVI=
DER );
 		if ( provider =3D=3D null ) provider =3D info.getPersistenceProviderClas=
sName();
 		if ( provider !=3D null && ! provider.trim().startsWith( IMPLEMENTATION_=
NAME ) ) {
-			log.info( "Required a different provider: " + provider );
+			log.info( "Required a different provider: {}", provider );
 			return null;
 		}
 		if ( info.getClassLoader() =3D=3D null ) {
@@ -559,7 +559,7 @@
 			if ( "class".equalsIgnoreCase( element ) ) result[0] =3D true;
 			if ( "hbm".equalsIgnoreCase( element ) ) result[1] =3D true;
 		}
-		log.debug( "Detect class: " + result[0] + "; detect hbm: " + result[1] );
+		log.debug( "Detect class: {}; detect hbm: {}", result[0], result[1] );
 		return result;
 	}
 =

@@ -856,7 +856,7 @@
 		//some spec compliance checking
 		//TODO centralize that?
 		if ( ! "true".equalsIgnoreCase( cfg.getProperty( Environment.AUTOCOMMIT =
) ) ) {
-			log.warn( Environment.AUTOCOMMIT + " =3D false break the EJB3 specifica=
tion" );
+			log.warn( "{} =3D false break the EJB3 specification", Environment.AUTO=
COMMIT );
 		}
 		discardOnClose =3D preparedProperties.getProperty( HibernatePersistence.=
DISCARD_PC_ON_CLOSE )
 				.equals( "true" );
@@ -911,10 +911,10 @@
 				}
 				if ( log.isInfoEnabled() ) {
 					if ( Boolean.TRUE.equals( useMetaInf ) ) {
-						log.info( getExceptionHeader() + META_INF_ORM_XML + " found");
+						log.info( "{} {} found", getExceptionHeader(), META_INF_ORM_XML);
 					}
 					else if (Boolean.FALSE.equals( useMetaInf ) ) {
-						log.info( getExceptionHeader() + "no " + META_INF_ORM_XML + " found"=
);
+						log.info( "{} No {} found", getExceptionHeader(), META_INF_ORM_XML);
 					}
 				}
 			}
@@ -994,12 +994,13 @@
 		}
 		if ( hasTxStrategy ) {
 			log.warn(
-					"Overriding " + Environment.TRANSACTION_STRATEGY + " is dangerous, th=
is might break the EJB3 specification implementation"
+					"Overriding {} is dangerous, this might break the EJB3 specification =
implementation",
+					Environment.TRANSACTION_STRATEGY
 			);
 		}
 		if ( preparedProperties.getProperty( Environment.FLUSH_BEFORE_COMPLETION=
 ).equals( "true" ) ) {
 			preparedProperties.setProperty( Environment.FLUSH_BEFORE_COMPLETION, "f=
alse" );
-			log.warn( "Defining " + Environment.FLUSH_BEFORE_COMPLETION + "=3Dtrue =
ignored in HEM" );
+			log.warn( "Defining {}=3Dtrue ignored in HEM", Environment.FLUSH_BEFORE=
_COMPLETION );
 		}
 		return preparedProperties;
 	}

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/EntityManagerImpl.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/EntityManagerImpl.java	2=
008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/EntityManagerImpl.java	2=
008-05-17 12:50:57 UTC (rev 14672)
@@ -7,8 +7,6 @@
 import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.transaction.Synchronization;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -16,13 +14,15 @@
 import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.SessionImplementor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Gavin King
  */
 public class EntityManagerImpl extends AbstractEntityManagerImpl {
 =

-	private static Log log =3D LogFactory.getLog( EntityManagerImpl.class );
+	private static final Logger log =3D LoggerFactory.getLogger( EntityManage=
rImpl.class );
 	protected Session session;
 	protected SessionFactory sessionFactory;
 	protected boolean open;
@@ -110,9 +110,8 @@
 									session.close();
 								}
 								else {
-									log.warn( "Entity Manager closed by someone else ("
-											+ Environment.AUTO_CLOSE_SESSION
-											+ " must not be used)");
+									log.warn( "Entity Manager closed by someone else ({} must not be =
used)",
+											Environment.AUTO_CLOSE_SESSION);
 								}
 							}
 							//TODO session =3D=3D null should not happen

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-17 =
12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-17 =
12:50:57 UTC (rev 14672)
@@ -1,18 +1,19 @@
 //$Id: $
 package org.hibernate.ejb;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

+
 /**
  * @author Emmanuel Bernard
  */
 public class Version {
 	public static final String VERSION =3D "3.3.2.GA";
-	private static Log log =3D LogFactory.getLog( Version.class );
+	private static final Logger log =3D LoggerFactory.getLogger( Version.clas=
s );
 =

 	static {
-		log.info( "Hibernate EntityManager " + VERSION );
+		log.info( "Hibernate EntityManager {}", VERSION );
 	}
 =

 	public static void touch() {

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/connection/Injecte=
dDataSourceConnectionProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/connection/InjectedDataS=
ourceConnectionProvider.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/connection/InjectedDataS=
ourceConnectionProvider.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -6,11 +6,11 @@
 import java.sql.SQLException;
 import javax.sql.DataSource;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
 import org.hibernate.connection.DatasourceConnectionProvider;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * A connection provider that uses an injected <tt>DataSource</tt>.
@@ -20,11 +20,10 @@
  * @see org.hibernate.connection.ConnectionProvider
  */
 public class InjectedDataSourceConnectionProvider extends DatasourceConnec=
tionProvider {
-	//TODO make datasource connection provider properties protected in 3.3
 	private String user;
 	private String pass;
 =

-	private static final Log log =3D LogFactory.getLog( InjectedDataSourceCon=
nectionProvider.class );
+	private final Logger log =3D LoggerFactory.getLogger( InjectedDataSourceC=
onnectionProvider.class );
 =

 	public void setDataSource(DataSource ds) {
 		super.setDataSource( ds );

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/event/EJB3PersistE=
ventListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/event/EJB3PersistEventLi=
stener.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/event/EJB3PersistEventLi=
stener.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -16,7 +16,7 @@
  */
 public class EJB3PersistEventListener extends DefaultPersistEventListener =
implements CallbackHandlerConsumer {
 	static {
-		EJB3CascadeStyle.PERSIST_EJB3.hasOrphanDelete(); //triggers class loading
+		EJB3CascadeStyle.PERSIST_EJB3.hasOrphanDelete(); //triggers class loadin=
g to override persist with PERSIST_EJB3
 	}
 =

 	private EntityCallbackHandler callbackHandler;

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/Abstract=
JarVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVis=
itor.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/AbstractJarVis=
itor.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -12,8 +12,8 @@
 =

 import javassist.bytecode.AnnotationsAttribute;
 import javassist.bytecode.ClassFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Parse a JAR of any form (zip file, exploded directory, ...)
@@ -25,7 +25,7 @@
  */
 //TODO shortcut when filters are null or empty
 public abstract class AbstractJarVisitor implements JarVisitor {
-	private static Log log =3D LogFactory.getLog( AbstractJarVisitor.class );
+	private final Logger log =3D LoggerFactory.getLogger( AbstractJarVisitor.=
class );
 	protected String unqualifiedJarName;
 	protected URL jarUrl;
 	protected boolean done =3D false;
@@ -113,7 +113,7 @@
 			fileName =3D fileName.substring( 0, fileName.length() - 4 );
 		}
 		unqualifiedJarName =3D fileName;
-		log.debug( "Searching mapped entities in jar/par: " + jarUrl );
+		log.debug( "Searching mapped entities in jar/par: {}", jarUrl );
 	}
 =

 	/**
@@ -159,7 +159,7 @@
 		}
 		else if ( entryName.endsWith( ".class" ) ) {
 			String name =3D entryName.substring( 0, entryNameLength - ".class".leng=
th() ).replace( '/', '.' );
-			log.debug( "Filtering: " + name );
+			log.debug( "Filtering: {}", name );
 			executeJavaElementFilter( name, classFilters, is, secondIs );
 		}
 		else {
@@ -177,7 +177,7 @@
 						secondIs.close();
 					}
 					is.close();
-					log.debug( "File Filter matched for " + name );
+					log.debug( "File Filter matched for {}", name );
 					Entry entry =3D new Entry( name, localIs );
 					int index =3D this.filters.indexOf( filter );
 					this.entries[index].add( entry );
@@ -210,7 +210,7 @@
 						localIs =3D null;
 						secondIs.close();
 					}
-					log.debug( "Java element filter matched for " + name );
+					log.debug( "Java element filter matched for {}", name );
 					Entry entry =3D new Entry( name, localIs );
 					int index =3D this.filters.indexOf( filter );
 					this.entries[index].add( entry );

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/Exploded=
JarVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVis=
itor.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVis=
itor.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -5,23 +5,21 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.net.URL;
 import java.net.URISyntaxException;
-import java.util.zip.ZipEntry;
+import java.net.URL;
 import java.util.Enumeration;
-import java.util.jar.JarInputStream;
 import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

+
 /**
  * @author Emmanuel Bernard
  */
 public class ExplodedJarVisitor extends AbstractJarVisitor {
-	private static Log log =3D LogFactory.getLog( ExplodedJarVisitor.class );
+	private final Logger log =3D LoggerFactory.getLogger( ExplodedJarVisitor.=
class );
 	private String entry;
 =

 	public ExplodedJarVisitor(URL url, Filter[] filters, String entry) {
@@ -51,11 +49,11 @@
 		}
 		=

 		if ( !jarFile.exists() ) {
-			log.warn( "Exploded jar does not exists (ignored): " + jarUrl );
+			log.warn( "Exploded jar does not exists (ignored): {}", jarUrl );
 			return;
 		}
 		if ( !jarFile.isDirectory() ) {
-			log.warn( "Exploded jar file not a directory (ignored): " + jarUrl );
+			log.warn( "Exploded jar file not a directory (ignored): {}", jarUrl );
 			return;
 		}
 		File rootFile;

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZipp=
edJarVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarV=
isitor.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarV=
isitor.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -13,8 +13,8 @@
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Work on a JAR that can be accessed through a File
@@ -22,7 +22,7 @@
  * @author Emmanuel Bernard
  */
 public class FileZippedJarVisitor extends AbstractJarVisitor {
-	private static Log log =3D LogFactory.getLog( FileZippedJarVisitor.class =
);
+	private final Logger log =3D LoggerFactory.getLogger( FileZippedJarVisito=
r.class );
 	private String entry;
 =

 	public FileZippedJarVisitor(String fileName, Filter[] filters) {

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStr=
eamZippedJarVisitor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZip=
pedJarVisitor.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZip=
pedJarVisitor.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -3,16 +3,15 @@
 =

 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedInputStream;
 import java.net.URL;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

+
 /**
  * Work on a JAR that can only be accessed through a inputstream
  * This is less efficient than the {@link FileZippedJarVisitor}
@@ -20,7 +19,7 @@
  * @author Emmanuel Bernard
  */
 public class InputStreamZippedJarVisitor extends AbstractJarVisitor {
-	private static Log log =3D LogFactory.getLog( InputStreamZippedJarVisitor=
.class );
+	private final Logger log =3D LoggerFactory.getLogger( InputStreamZippedJa=
rVisitor.class );
 	private String entry;
 =

 	public InputStreamZippedJarVisitor(URL url, Filter[] filters, String entr=
y) {

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisit=
orFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFact=
ory.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFact=
ory.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -8,15 +8,15 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class JarVisitorFactory {
-	private static Log log =3D LogFactory.getLog( JarVisitorFactory.class );
+	private static final Logger log =3D LoggerFactory.getLogger( JarVisitorFa=
ctory.class );
 =

 	/**
 	 * Get the JAR URL of the JAR containing the given entry
@@ -70,7 +70,7 @@
 					"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessag=
e()
 			);
 		}
-		log.trace("JAR URL from URL Entry: " + url + " >> " + jarUrl);
+		log.trace("JAR URL from URL Entry: {} >> {}", url, jarUrl);
 		return jarUrl;
 	}
 =


Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/Persiste=
nceXmlLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/PersistenceXml=
Loader.java	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/PersistenceXml=
Loader.java	2008-05-17 12:50:57 UTC (rev 14672)
@@ -13,8 +13,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.cfg.EJB3DTDEntityResolver;
 import org.hibernate.ejb.HibernatePersistence;
 import org.hibernate.ejb.util.ConfigurationHelper;
@@ -27,6 +25,8 @@
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Persistence.xml handler
@@ -35,7 +35,7 @@
  * @author Emmanuel Bernard
  */
 public final class PersistenceXmlLoader {
-	private static Log log =3D LogFactory.getLog( PersistenceXmlLoader.class =
);
+	private static final Logger log =3D LoggerFactory.getLogger( PersistenceX=
mlLoader.class );
 =

 	private PersistenceXmlLoader() {
 	}
@@ -153,7 +153,7 @@
 		PersistenceMetadata metadata =3D new PersistenceMetadata();
 		String puName =3D top.getAttribute( "name" );
 		if ( StringHelper.isNotEmpty( puName ) ) {
-			log.trace( "Persistent Unit name from persistence.xml: " + puName );
+			log.trace( "Persistent Unit name from persistence.xml: {}", puName );
 			metadata.setName( puName );
 		}
 		NodeList children =3D top.getChildNodes();
@@ -243,17 +243,17 @@
 			if ( resolver instanceof EJB3DTDEntityResolver ) {
 				if ( ( (EJB3DTDEntityResolver) resolver ).isResolved() =3D=3D false ) =
return;
 			}
-			log.error( "Error parsing XML: " + file + '(' + error.getLineNumber() +=
 ") " + error.getMessage() );
+			log.error( "Error parsing XML: {}({}) {}", new Object[] { file, error.g=
etLineNumber(), error.getMessage() } );
 			errors.add( error );
 		}
 =

 		public void fatalError(SAXParseException error) {
-			log.error( "Error parsing XML: " + file + '(' + error.getLineNumber() +=
 ") " + error.getMessage() );
+			log.error( "Error parsing XML: {}({}) {}", new Object[] { file, error.g=
etLineNumber(), error.getMessage() } );
 			errors.add( error );
 		}
 =

 		public void warning(SAXParseException warn) {
-			log.warn( "Warning parsing XML: " + file + '(' + warn.getLineNumber() +=
 ") " + warn.getMessage() );
+			log.warn( "Warning parsing XML: {}({}) {}", new Object[] { file, warn.g=
etLineNumber(), warn.getMessage() } );
 		}
 	}
 =


Modified: entitymanager/trunk/src/java/org/hibernate/ejb/util/NamingHelper.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/util/NamingHelper.java	2=
008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/util/NamingHelper.java	2=
008-05-17 12:50:57 UTC (rev 14672)
@@ -10,18 +10,18 @@
 import javax.naming.event.NamingExceptionEvent;
 import javax.naming.event.NamingListener;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.ejb.HibernatePersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class NamingHelper {
-	private NamingHelper() {};
+	private NamingHelper() {}
 =

-	private static Log log =3D LogFactory.getLog( NamingHelper.class );
+	private static final Logger log =3D LoggerFactory.getLogger( NamingHelper=
.class );
 =

 	/** bind the configuration to the JNDI */
 	public static void bind(Ejb3Configuration cfg) {
@@ -30,12 +30,12 @@
 			log.debug( "No JNDI name configured for binding Ejb3Configuration" );
 		}
 		else {
-			log.info( "Ejb3Configuration name: " + name );
+			log.info( "Ejb3Configuration name: {}", name );
 =

 			try {
 				Context ctx =3D org.hibernate.util.NamingHelper.getInitialContext( cfg=
.getProperties() );
 				org.hibernate.util.NamingHelper.bind( ctx, name, cfg );
-				log.info( "Bound Ejb3Configuration to JNDI name: " + name );
+				log.info( "Bound Ejb3Configuration to JNDI name: {}", name );
 				( (EventContext) ctx ).addNamingListener( name, EventContext.OBJECT_SC=
OPE, LISTENER );
 			}
 			catch (InvalidNameException ine) {
@@ -52,21 +52,21 @@
 =

 	private static final NamingListener LISTENER =3D new NamespaceChangeListe=
ner() {
 		public void objectAdded(NamingEvent evt) {
-			log.debug( "An Ejb3Configuration was successfully bound to name: " + ev=
t.getNewBinding().getName() );
+			log.debug( "An Ejb3Configuration was successfully bound to name: {}", e=
vt.getNewBinding().getName() );
 		}
 =

 		public void objectRemoved(NamingEvent evt) {
 			String name =3D evt.getOldBinding().getName();
-			log.info( "An Ejb3Configuration was unbound from name: " + name );
+			log.info( "An Ejb3Configuration was unbound from name: {}", name );
 		}
 =

 		public void objectRenamed(NamingEvent evt) {
 			String name =3D evt.getOldBinding().getName();
-			log.info( "An Ejb3Configuration was renamed from name: " + name );
+			log.info( "An Ejb3Configuration was renamed from name: {}", name );
 		}
 =

 		public void namingExceptionThrown(NamingExceptionEvent evt) {
-			log.warn( "Naming exception occurred accessing Ejb3Configuration: " + e=
vt.getException() );
+			log.warn( "Naming exception occurred accessing Ejb3Configuration", evt.=
getException() );
 		}
 	};
 =


Modified: entitymanager/trunk/src/java/org/hibernate/engine/EJB3CascadingAc=
tion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/engine/EJB3CascadingAction.j=
ava	2008-05-17 12:49:38 UTC (rev 14671)
+++ entitymanager/trunk/src/java/org/hibernate/engine/EJB3CascadingAction.j=
ava	2008-05-17 12:50:57 UTC (rev 14672)
@@ -7,8 +7,8 @@
 import org.hibernate.event.EventSource;
 import org.hibernate.HibernateException;
 import org.hibernate.type.CollectionType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * Because of CascadingAction constructor visibility
@@ -17,16 +17,14 @@
  * @author Emmanuel Bernard
  */
 public abstract class EJB3CascadingAction extends CascadingAction {
-	private static Log log =3D LogFactory.getLog( CascadingAction.class );
+	private static Logger log =3D LoggerFactory.getLogger( CascadingAction.cl=
ass );
 	/**
 	 * @see org.hibernate.Session#persist(Object)
 	 */
 	public static final CascadingAction PERSIST_SKIPLAZY =3D new CascadingAct=
ion() {
 		public void cascade(EventSource session, Object child, String entityName=
, Object anything, boolean isCascadeDeleteEnabled)
 		throws HibernateException {
-			if ( log.isTraceEnabled() ) {
-				log.trace( "cascading to persist: " + entityName );
-			}
+			log.trace( "cascading to persist: {}", entityName );
 			session.persist( entityName, child, (Map) anything );
 		}
 		public Iterator getCascadableChildrenIterator(EventSource session, Colle=
ctionType collectionType, Object collection) {


--===============2370340026303148050==--

From hibernate-commits at lists.jboss.org Sat May 17 08:52:14 2008
Content-Type: multipart/mixed; boundary="===============2129700905670541276=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14673 - in validator/trunk:
 src/java/org/hibernate/validator and 1 other directories.
Date: Sat, 17 May 2008 08:52:14 -0400
Message-ID: <E1JxLtW-0006TS-Q1@committer01.frg.pub.inap.atl.jboss.com>

--===============2129700905670541276==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-17 08:52:14 -0400 (Sat, 17 May 2008)
New Revision: 14673

Modified:
   validator/trunk/ivy.xml
   validator/trunk/pom.xml
   validator/trunk/src/java/org/hibernate/validator/ClassValidator.java
   validator/trunk/src/java/org/hibernate/validator/Version.java
   validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMes=
sageInterpolator.java
Log:
HV-57 move to slf4j

Modified: validator/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/ivy.xml	2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/ivy.xml	2008-05-17 12:52:14 UTC (rev 14673)
@@ -9,17 +9,16 @@
         <conf name=3D"test" visibility=3D"private" description=3D"Dependen=
cies needed for testing purposes"/>
     </configurations>
     <publications>
-        <artifact name=3D"hibernate-validator" conf=3D"core"/>
+        <artifact name=3D"hibernate-validator" conf=3D"default"/>
     </publications>
     <dependencies>
         <!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
         <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
-        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>
 =

         <!-- transitive dependencies -->
-        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/>
         <dependency org=3D"antlr" name=3D"antlr" rev=3D"2.7.6" conf=3D"tes=
t->default"/>
         <dependency org=3D"commons-collections" name=3D"commons-collection=
s" rev=3D"3.1" conf=3D"test->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"tes=
t->default"/>

Modified: validator/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/pom.xml	2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/pom.xml	2008-05-17 12:52:14 UTC (rev 14673)
@@ -30,9 +30,9 @@
                 <version>3.1.0.CR1</version>
             </dependency>
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.4.2</version>
             </dependency>
 =

             <dependency>

Modified: validator/trunk/src/java/org/hibernate/validator/ClassValidator.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/ClassValidator.java	20=
08-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/ClassValidator.java	20=
08-05-17 12:52:14 UTC (rev 14673)
@@ -23,8 +23,6 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.Hibernate;
 import org.hibernate.MappingException;
@@ -40,6 +38,8 @@
 import org.hibernate.annotations.common.reflection.java.JavaReflectionMana=
ger;
 import org.hibernate.util.IdentitySet;
 import org.hibernate.validator.interpolator.DefaultMessageInterpolatorAggr=
egator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 =

 /**
@@ -50,7 +50,7 @@
  */
 public class ClassValidator<T> implements Serializable {
 	//TODO Define magic number
-	private static Log log =3D LogFactory.getLog( ClassValidator.class );
+	private static final Logger log =3D LoggerFactory.getLogger( ClassValidat=
or.class );
 	private static final InvalidValue[] EMPTY_INVALID_VALUE_ARRAY =3D new Inv=
alidValue[]{};
 	private static final String DEFAULT_VALIDATOR_MESSAGE =3D "org.hibernate.=
validator.resources.DefaultValidatorMessages";
 	private static final String VALIDATOR_MESSAGE =3D "ValidatorMessages";
@@ -164,7 +164,7 @@
 			);
 		}
 		catch (MissingResourceException e) {
-			log.trace( "ResourceBundle " + VALIDATOR_MESSAGE + " not found in threa=
d context classloader" );
+			log.trace( "ResourceBundle {} not found in thread context classloader",=
 VALIDATOR_MESSAGE );
 			//then use the Validator Framework classloader
 			try {
 				rb =3D ResourceBundle.getBundle(
@@ -175,7 +175,8 @@
 			}
 			catch (MissingResourceException ee) {
 				log.debug(
-						"ResourceBundle ValidatorMessages not found in Validator classloader=
. Delegate to " + DEFAULT_VALIDATOR_MESSAGE
+						"ResourceBundle ValidatorMessages not found in Validator classloader=
. Delegate to {}",
+						DEFAULT_VALIDATOR_MESSAGE
 				);
 				//the user did not override the default ValidatorMessages
 				rb =3D null;
@@ -312,7 +313,7 @@
 			validatorPresent =3D validatorPresent || agrValidPresent;
 		}
 		if ( validatorPresent && !member.isTypeResolved() ) {
-			log.warn( "Original type of property " + member + " is unbound and has =
been approximated." );
+			log.warn( "Original type of property {} is unbound and has been approxi=
mated.", member );
 		}
 	}
 =


Modified: validator/trunk/src/java/org/hibernate/validator/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/Version.java	2008-05-1=
7 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/Version.java	2008-05-1=
7 12:52:14 UTC (rev 14673)
@@ -1,8 +1,8 @@
 //$Id: $
 package org.hibernate.validator;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Hibernate Vaildator version
@@ -11,10 +11,10 @@
  */
 public class Version {
 	public static final String VERSION =3D "3.0.0.GA";
-	private static Log log =3D LogFactory.getLog( Version.class );
+	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {
-		log.info( "Hibernate Validator " + VERSION );
+		log.info( "Hibernate Validator {}", VERSION );
 	}
 =

 	public static void touch() {

Modified: validator/trunk/src/java/org/hibernate/validator/interpolator/Def=
aultMessageInterpolator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolator.java	2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMe=
ssageInterpolator.java	2008-05-17 12:52:14 UTC (rev 14673)
@@ -12,11 +12,11 @@
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.util.StringHelper;
 import org.hibernate.validator.MessageInterpolator;
 import org.hibernate.validator.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Resource bundle based interpolator
@@ -25,7 +25,7 @@
  * @author Emmanuel Bernard
  */
 public class DefaultMessageInterpolator implements MessageInterpolator, Se=
rializable {
-	private static Log log =3D LogFactory.getLog( DefaultMessageInterpolator.=
class );
+	private static final Logger log =3D LoggerFactory.getLogger( DefaultMessa=
geInterpolator.class );
 	private Map<String, Object> annotationParameters =3D new HashMap<String, =
Object>();
 	private transient ResourceBundle messageBundle;
 	private transient ResourceBundle defaultMessageBundle;
@@ -52,11 +52,11 @@
 			}
 			catch (IllegalAccessException e) {
 				//really should not happen, but we degrade nicely
-				log.warn( "Unable to access " + StringHelper.qualify( clazz.toString()=
, method.getName() ) );
+				log.warn( "Unable to access {}", StringHelper.qualify( clazz.toString(=
), method.getName() ) );
 			}
 			catch (InvocationTargetException e) {
 				//really should not happen, but we degrade nicely
-				log.warn( "Unable to access " + StringHelper.qualify( clazz.toString()=
, method.getName() ) );
+				log.warn( "Unable to access {}", StringHelper.qualify( clazz.toString(=
), method.getName() ) );
 			}
 		}
 		annotationMessage =3D (String) annotationParameters.get( "message" );


--===============2129700905670541276==--

From hibernate-commits at lists.jboss.org Sat May 17 08:54:07 2008
Content-Type: multipart/mixed; boundary="===============3159337642337367567=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14674 - in search/trunk:
 src/java/org/hibernate/search and 11 other directories.
Date: Sat, 17 May 2008 08:54:07 -0400
Message-ID: <E1JxLvL-0006Wd-3e@committer01.frg.pub.inap.atl.jboss.com>

--===============3159337642337367567==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-17 08:54:06 -0400 (Sat, 17 May 2008)
New Revision: 14674

Modified:
   search/trunk/ivy.xml
   search/trunk/pom.xml
   search/trunk/src/java/org/hibernate/search/Version.java
   search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParamet=
ers.java
   search/trunk/src/java/org/hibernate/search/backend/Workspace.java
   search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSH=
ibernateSearchController.java
   search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBac=
kendQueueProcessor.java
   search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWor=
ker.java
   search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
   search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java
   search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
   search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollection=
EventListener.java
   search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListe=
ner.java
   search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
   search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.j=
ava
   search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.j=
ava
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper=
.java
   search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvid=
er.java
   search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvide=
r.java
   search/trunk/src/java/org/hibernate/search/store/optimization/Incrementa=
lOptimizerStrategy.java
   search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/Co=
ntact.java
   search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTes=
t.java
   search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.java
Log:
HSEARCH-197 move to slf4j

Modified: search/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/ivy.xml	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/ivy.xml	2008-05-17 12:54:06 UTC (rev 14674)
@@ -16,8 +16,8 @@
         <!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
         <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
+        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>        =

         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
-        <dependency org=3D"commons-logging" name=3D"commons-logging" rev=
=3D"1.0.4" conf=3D"default->default"/>
         <dependency org=3D"javax.transaction" name=3D"jta" rev=3D"1.1" con=
f=3D"default->default"/>
         <dependency org=3D"org.apache.lucene" name=3D"lucene-core" rev=3D"=
2.3.1" conf=3D"default->default"/>
         <dependency org=3D"javax.jms" name=3D"jms" rev=3D"1.1" conf=3D"def=
ault->default"/> <!-- optional -->
@@ -25,7 +25,6 @@
         <dependency org=3D"org.hibernate.apache.lucene.solr" name=3D"apach=
e-solr-analyzer" rev=3D"1.2.0" conf=3D"default->default"/> <!-- optional -->
 =

         <!-- transitive dependencies -->
-        <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"test->default"/>
         <dependency org=3D"antlr" name=3D"antlr" rev=3D"2.7.6" conf=3D"tes=
t->default"/>
         <dependency org=3D"commons-collections" name=3D"commons-collection=
s" rev=3D"3.1" conf=3D"test->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"tes=
t->default"/>

Modified: search/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/pom.xml	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/pom.xml	2008-05-17 12:54:06 UTC (rev 14674)
@@ -28,10 +28,10 @@
             <version>2.3.1</version>
         </dependency>
         <dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.2</version>
+        </dependency>
         <dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>

Modified: search/trunk/src/java/org/hibernate/search/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/Version.java	2008-05-17 12:5=
2:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/Version.java	2008-05-17 12:5=
4:06 UTC (rev 14674)
@@ -3,18 +3,19 @@
 =

 import java.util.Date;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

+
 /**
  * @author Emmanuel Bernard
  */
 public class Version {
 	public static final String VERSION =3D "3.1.x." + new Date();
-	private static Log log =3D LogFactory.getLog( Version.class );
+	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {
-		log.info( "Hibernate Search " + VERSION );
+		log.info( "Hibernate Search {}", VERSION );
 	}
 =

 	public static void touch() {

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexing=
Parameters.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -6,11 +6,11 @@
 import java.util.Map;
 import java.util.Properties;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.IndexWriter;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.configuration.IndexWriterSetting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Wrapper class around the Lucene indexing parameters <i>mergeFactor</i>,=
 <i>maxMergeDocs</i>,
@@ -24,8 +24,6 @@
  */
 public class LuceneIndexingParameters implements Serializable {
 =

-	private static final Log log =3D LogFactory.getLog( LuceneIndexingParamet=
ers.class );
-
 	// value keyword
 	public static final String EXPLICIT_DEFAULT_VALUE =3D "default"; =

 	// property path keywords

Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-17 12:54:06 UTC (rev 14674)
@@ -8,8 +8,6 @@
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.SimpleAnalyzer;
 import org.apache.lucene.index.IndexReader;
@@ -20,6 +18,8 @@
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * Lucene workspace.
@@ -43,7 +43,7 @@
  */
 //TODO introduce the notion of read only IndexReader? We cannot enforce it=
 because Lucene use abstract classes, not interfaces
 public class Workspace {
-	private static Log log =3D LogFactory.getLog( Workspace.class );
+	private final Logger log =3D LoggerFactory.getLogger( Workspace.class );
 	private Map<DirectoryProvider, IndexReader> readers =3D new HashMap<Direc=
toryProvider, IndexReader>();
 	private Map<DirectoryProvider, IndexWriter> writers =3D new HashMap<Direc=
toryProvider, IndexWriter>();
 	private List<DirectoryProvider> lockedProviders =3D new ArrayList<Directo=
ryProvider>();

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/Abstr=
actJMSHibernateSearchController.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -9,12 +9,12 @@
 import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.Session;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.util.ContextHelper;
 import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Implement the Hibernate Search controller responsible for processing the
@@ -26,7 +26,7 @@
  * @author Emmanuel Bernard
  */
 public abstract class AbstractJMSHibernateSearchController implements Mess=
ageListener {
-	private static Log log =3D LogFactory.getLog( AbstractJMSHibernateSearchC=
ontroller.class );
+	private static Logger log =3D LoggerFactory.getLogger( AbstractJMSHiberna=
teSearchController.class );
 =

 	/**
 	 * return the current or give a new session
@@ -62,7 +62,7 @@
 	 */
 	public void onMessage(Message message) {
 		if ( !( message instanceof ObjectMessage ) ) {
-			log.error( "Incorrect message type: " + message.getClass() );
+			log.error( "Incorrect message type: {}", message.getClass() );
 			return;
 		}
 		ObjectMessage objectMessage =3D (ObjectMessage) message;

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/Lu=
ceneBackendQueueProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBa=
ckendQueueProcessor.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBa=
ckendQueueProcessor.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.ArrayList;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.search.backend.AddLuceneWork;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.Workspace;
@@ -19,6 +17,8 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.IndexShardingStrategy;
 import org.hibernate.annotations.common.AssertionFailure;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Apply the operations to Lucene directories avoiding deadlocks.
@@ -32,7 +32,7 @@
 	/**
 	 * Class logger.
 	 */
-	private static Log log =3D LogFactory.getLog( LuceneBackendQueueProcessor=
.class );
+	private static Logger log =3D LoggerFactory.getLogger( LuceneBackendQueue=
Processor.class );
 	=

 	private List<LuceneWork> queue;
 	private SearchFactoryImplementor searchFactoryImplementor;

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/Lu=
ceneWorker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWo=
rker.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWo=
rker.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -4,8 +4,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
@@ -21,6 +19,8 @@
 import org.hibernate.search.backend.PurgeAllLuceneWork;
 import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.store.DirectoryProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Stateless implementation that performs a unit of work.
@@ -31,7 +31,7 @@
  */
 public class LuceneWorker {
 	private Workspace workspace;
-	private static Log log =3D LogFactory.getLog( LuceneWorker.class );
+	private static final Logger log =3D LoggerFactory.getLogger( LuceneWorker=
.class );
 =

 	public LuceneWorker(Workspace workspace) {
 		this.workspace =3D workspace;
@@ -63,8 +63,7 @@
 	}
 =

 	private void add(Class entity, Serializable id, Document document, Direct=
oryProvider provider) {
-		if ( log.isTraceEnabled() )
-			log.trace( "add to Lucene index: " + entity + "#" + id + ": " + documen=
t );
+		log.trace( "add to Lucene index: {}#{}:{}", new Object[] { entity, id, d=
ocument } );
 		IndexWriter writer =3D workspace.getIndexWriter( provider, entity, true =
);
 		try {
 			writer.addDocument( document );
@@ -86,7 +85,7 @@
 		 * We can only delete by term, and the index doesn't have a termt that
 		 * uniquely identify the entry. See logic below
 		 */
-		log.trace( "remove from Lucene index: " + entity + "#" + id );
+		log.trace( "remove from Lucene index: {}#{}", entity, id );
 		DocumentBuilder builder =3D workspace.getDocumentBuilder( entity );
 		Term term =3D builder.getTerm( id );
 		IndexReader reader =3D workspace.getIndexReader( provider, entity );
@@ -121,8 +120,7 @@
 =

 	public void performWork(OptimizeLuceneWork work, DirectoryProvider provid=
er) {
 		Class entity =3D work.getEntityClass();
-		if ( log.isTraceEnabled() )
-			log.trace( "optimize Lucene index: " + entity );
+		log.trace( "optimize Lucene index: {}", entity );
 		IndexWriter writer =3D workspace.getIndexWriter( provider, entity, false=
 );
 		try {
 			writer.optimize();
@@ -135,8 +133,7 @@
 =

 	public void performWork(PurgeAllLuceneWork work, DirectoryProvider provid=
er) {
 		Class entity =3D work.getEntityClass();
-		if ( log.isTraceEnabled() )
-			log.trace( "purgeAll Lucene index: " + entity );
+		log.trace( "purgeAll Lucene index: {}", entity );
 		IndexReader reader =3D workspace.getIndexReader( provider, entity );
 		try {
 			Term term =3D new Term( DocumentBuilder.CLASS_FIELDNAME, entity.getName=
() );

Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-17 12:54:06 UTC (rev 14674)
@@ -11,8 +11,6 @@
 import java.util.Map;
 import java.util.Set;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -53,6 +51,8 @@
 import org.hibernate.search.store.IndexShardingStrategy;
 import org.hibernate.search.util.BinderHelper;
 import org.hibernate.search.util.ScopedAnalyzer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Set up and provide a manager for indexes classes
@@ -64,7 +64,7 @@
  * @author Hardy Ferentschik
  */
 public class DocumentBuilder<T> {
-	private static final Log log =3D LogFactory.getLog( DocumentBuilder.class=
 );
+	private static final Logger log =3D LoggerFactory.getLogger( DocumentBuil=
der.class );
 =

 	private final PropertiesMetadata rootPropertiesMetadata;
 	private final XClass beanClass;
@@ -203,8 +203,8 @@
 				similarity =3D (Similarity) similarityClass.newInstance();
 			}
 			catch (Exception e) {
-				log.error( "Exception attempting to instantiate Similarity '" + simila=
rityClass.getName()
-						+ "' set for " + beanClass.getName() );
+				log.error( "Exception attempting to instantiate Similarity '{}' set fo=
r {}",
+						similarityClass.getName(), beanClass.getName() );
 			}
 		}
 	}
@@ -348,7 +348,7 @@
 			}
 			else if ( log.isTraceEnabled() ) {
 				String localPrefix =3D buildEmbeddedPrefix( prefix, embeddedAnn, membe=
r );
-				log.trace( "depth reached, ignoring " + localPrefix );
+				log.trace( "depth reached, ignoring {}", localPrefix );
 			}
 =

 			level--;
@@ -760,7 +760,7 @@
 			if ( store !=3D Field.Store.NO && TwoWayFieldBridge.class.isAssignableF=
rom( fieldBridge.getClass() ) ) {
 				result[matchingPosition] =3D ( (TwoWayFieldBridge) fieldBridge ).get( =
fieldName, document );
 				if ( log.isTraceEnabled() ) {
-					log.trace( "Field " + fieldName + " projected as " + result[matchingP=
osition] );
+					log.trace( "Field {} projected as {}", fieldName, result[matchingPosi=
tion] );
 				}
 			}
 			else {

Modified: search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java	200=
8-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/engine/ObjectLoader.java	200=
8-05-17 12:54:06 UTC (rev 14674)
@@ -4,16 +4,16 @@
 import java.util.ArrayList;
 import java.util.List;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
  */
 public class ObjectLoader implements Loader {
-	private static final Log log =3D LogFactory.getLog( ObjectLoader.class );
+	private static final Logger log =3D LoggerFactory.getLogger( ObjectLoader=
.class );
 	private Session session;
 =

 	public void init(Session session, SearchFactoryImplementor searchFactoryI=
mplementor) {
@@ -28,8 +28,8 @@
 		}
 		catch (RuntimeException e) {
 			if ( LoaderHelper.isObjectNotFoundException( e ) ) {
-				log.debug( "Object found in Search index but not in database: "
-						+ entityInfo.clazz + " wih id " + entityInfo.id );
+				log.debug( "Object found in Search index but not in database: {} with =
id {}",
+						entityInfo.clazz, entityInfo.id );
 				maybeProxy =3D null;
 			}
 			else {
@@ -54,8 +54,8 @@
 			}
 			catch (RuntimeException e) {
 				if ( LoaderHelper.isObjectNotFoundException( e ) ) {
-					log.debug( "Object found in Search index but not in database: "
-							+ entityInfo.clazz + " wih id " + entityInfo.id );
+					log.debug( "Object found in Search index but not in database: {} with=
 id {}",
+							entityInfo.clazz, entityInfo.id );
 				}
 				else {
 					throw e;

Modified: search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java	2008=
-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java	2008=
-05-17 12:54:06 UTC (rev 14674)
@@ -4,14 +4,14 @@
 import java.util.ArrayList;
 import java.util.List;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.criterion.Disjunction;
 import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
@@ -19,7 +19,7 @@
 public class QueryLoader implements Loader {
 	private static final int MAX_IN_CLAUSE =3D 500;
 	private static final List EMPTY_LIST =3D new ArrayList( 0 );
-	private static Log log =3D LogFactory.getLog( QueryLoader.class );
+	private final Logger log =3D LoggerFactory.getLogger( QueryLoader.class );
 =

 	private Session session;
 	private Class entityType;
@@ -44,8 +44,8 @@
 		}
 		catch (RuntimeException e) {
 			if ( LoaderHelper.isObjectNotFoundException( e ) ) {
-				log.debug( "Object found in Search index but not in database: "
-						+ entityInfo.clazz + " wih id " + entityInfo.id );
+				log.debug( "Object found in Search index but not in database: {} with =
id {}",
+						entityInfo.clazz, entityInfo.id );
 				maybeProxy =3D null;
 			}
 			else {
@@ -91,8 +91,8 @@
 			}
 			else {
 				if ( log.isDebugEnabled() ) {
-					log.debug( "Object found in Search index but not in database: "
-						+ entityInfo.clazz + " wih id " + entityInfo.id );
+					log.debug( "Object found in Search index but not in database: {} with=
 {}",
+						entityInfo.clazz, entityInfo.id );
 				}
 			}
 		}

Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexCol=
lectionEventListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectio=
nEventListener.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectio=
nEventListener.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -9,12 +9,11 @@
 import org.hibernate.event.PostCollectionRecreateEvent;
 import org.hibernate.event.PostCollectionRemoveEvent;
 import org.hibernate.event.PostCollectionUpdateEvent;
-import org.hibernate.event.AbstractEvent;
 import org.hibernate.event.AbstractCollectionEvent;
 import org.hibernate.search.backend.WorkType;
 import org.hibernate.engine.EntityEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Support collection event listening (starts from hibernate core 3.2.6)
@@ -26,7 +25,7 @@
 		implements PostCollectionRecreateEventListener,
 		PostCollectionRemoveEventListener,
 		PostCollectionUpdateEventListener {
-	private static Log log =3D LogFactory.getLog( FullTextIndexCollectionEven=
tListener.class );
+	private final Logger log =3D LoggerFactory.getLogger( FullTextIndexCollec=
tionEventListener.class );
 =

 	public void onPostRecreateCollection(PostCollectionRecreateEvent event) {
 		processCollectionEvent( event );
@@ -43,7 +42,10 @@
 		if ( used && searchFactoryImplementor.getDocumentBuilders().containsKey(=
 entity.getClass() ) ) {
 			Serializable id =3D getId( entity, event );
 			if (id =3D=3D null) {
-				log.warn( "Unable to reindex entity on collection change, id cannot be=
 extracted: " + event.getAffectedOwnerEntityName() );
+				log.warn(
+						"Unable to reindex entity on collection change, id cannot be extract=
ed: {}",
+						event.getAffectedOwnerEntityName()
+				);
 				return;
 			}
 			processWork( entity, id, WorkType.COLLECTION, event );

Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEve=
ntListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -3,8 +3,6 @@
 =

 import java.io.Serializable;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.event.AbstractEvent;
 import org.hibernate.event.Initializable;

Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImp=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-17 12:54:06 UTC (rev 14674)
@@ -12,8 +12,6 @@
 import java.util.Map;
 import java.util.Set;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanClause;
@@ -56,6 +54,8 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.ContextHelper;
 import org.hibernate.transform.ResultTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Implementation of {@link org.hibernate.search.FullTextQuery}
@@ -65,7 +65,7 @@
  */
 //TODO implements setParameter()
 public class FullTextQueryImpl extends AbstractQueryImpl implements FullTe=
xtQuery {
-	private static final Log log =3D LogFactory.getLog( FullTextQueryImpl.cla=
ss );
+	private final Logger log =3D LoggerFactory.getLogger( FullTextQueryImpl.c=
lass );
 	private org.apache.lucene.search.Query luceneQuery;
 	private Class[] classes;
 	private Set<Class> classesAndSubclasses;

Modified: search/trunk/src/java/org/hibernate/search/query/ScrollableResult=
sImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.=
java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.=
java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -15,8 +15,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.IndexSearcher;
 import org.hibernate.HibernateException;
@@ -27,6 +25,8 @@
 import org.hibernate.search.engine.EntityInfo;
 import org.hibernate.search.engine.Loader;
 import org.hibernate.type.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Implements scollable and paginated resultsets.
@@ -50,7 +50,7 @@
  * @author John Griffin
  */
 public class ScrollableResultsImpl implements ScrollableResults {
-	private static Log log =3D LogFactory.getLog( ScrollableResultsImpl.class=
 );
+	private static Logger log =3D LoggerFactory.getLogger( ScrollableResultsI=
mpl.class );
 	private final IndexSearcher searcher;
 	private final SearchFactory searchFactory;
 	private final Hits hits;

Modified: search/trunk/src/java/org/hibernate/search/reader/SharedReaderPro=
vider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.=
java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.=
java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -11,8 +11,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.MultiReader;
 import org.hibernate.annotations.common.AssertionFailure;
@@ -21,6 +19,8 @@
 import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiR=
eader;
 import static org.hibernate.search.reader.ReaderProviderHelper.clean;
 import org.hibernate.search.store.DirectoryProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Share readers per SearchFactory, reusing them iff they are still valid.
@@ -29,7 +29,7 @@
  */
 public class SharedReaderProvider implements ReaderProvider {
 	private static Field subReadersField;
-	private static Log log =3D LogFactory.getLog( SharedReaderProvider.class =
);
+	private final Logger log =3D LoggerFactory.getLogger ( SharedReaderProvid=
er.class );
 	/**
 	 * nonfair lock. Need to be acquired on indexReader acquisition or releas=
e (semaphore)
 	 */
@@ -58,13 +58,13 @@
 		boolean trace =3D log.isTraceEnabled();
 		int length =3D directoryProviders.length;
 		IndexReader[] readers =3D new IndexReader[length];
-		if ( trace ) log.trace( "Opening IndexReader for directoryProviders: " +=
 length );
+		if ( trace ) log.trace( "Opening IndexReader for directoryProviders: {}"=
, length );
 =

 		for (int index =3D 0; index < length; index++) {
 			DirectoryProvider directoryProvider =3D directoryProviders[index];
 			IndexReader reader;
 			Lock directoryProviderLock =3D perDirectoryProviderManipulationLocks.ge=
t( directoryProvider );
-			if ( trace ) log.trace( "Opening IndexReader from " + directoryProvider=
.getDirectory().toString() );
+			if ( trace ) log.trace( "Opening IndexReader from {}", directoryProvide=
r.getDirectory() );
 			directoryProviderLock.lock(); //needed for same problem as the double-c=
hecked locking
 			try {
 				reader =3D activeSearchIndexReaders.get( directoryProvider );
@@ -74,7 +74,7 @@
 			}
 			if ( reader =3D=3D null ) {
 				if ( trace )
-					log.trace( "No shared IndexReader, opening a new one: " + directoryPr=
ovider.getDirectory().toString() );
+					log.trace( "No shared IndexReader, opening a new one: {}", directoryP=
rovider.getDirectory() );
 				reader =3D replaceActiveReader( null, directoryProviderLock, directory=
Provider, readers );
 			}
 			else {
@@ -86,14 +86,16 @@
 					throw new SearchException( "Unable to read current status of Lucene I=
ndexReader", e );
 				}
 				if ( !isCurrent ) {
-					if ( trace )
-						log.trace( "Out of date shared IndexReader found, opening a new one:=
 " + directoryProvider.getDirectory().toString() );
+					if ( trace ) {
+						log.trace( "Out of date shared IndexReader found, opening a new one:=
 {}",
+								directoryProvider.getDirectory() );
+					}
 					IndexReader outOfDateReader =3D reader;
 					reader =3D replaceActiveReader( outOfDateReader, directoryProviderLoc=
k, directoryProvider, readers );
 				}
 				else {
 					if ( trace )
-						log.trace( "Valid shared IndexReader: " + directoryProvider.getDirec=
tory().toString() );
+						log.trace( "Valid shared IndexReader: {}" + directoryProvider.getDir=
ectory() );
 					directoryProviderLock.lock();
 					try {
 						//read the latest active one, the current one could be out of date a=
nd closed already
@@ -105,7 +107,7 @@
 							//TODO if readerData is null????
 							readerData.semaphore++;
 							searchIndexReaderSemaphores.put( reader, readerData ); //not necess=
ary
-							if ( trace ) log.trace( "Semaphore increased: " + readerData.semaph=
ore + " for " + reader );
+							if ( trace ) log.trace( "Semaphore increased: {} for {}", readerDat=
a.semaphore, reader );
 						}
 						finally {
 							semaphoreIndexReaderLock.unlock();
@@ -145,7 +147,7 @@
 			semaphoreIndexReaderLock.lock();
 			try {
 				searchIndexReaderSemaphores.put( reader, new ReaderData( 1, directoryP=
rovider ) );
-				if ( trace ) log.trace( "Semaphore: 1 for " + reader );
+				if ( trace ) log.trace( "Semaphore: 1 for {}", reader );
 				if ( outOfDateReader !=3D null ) {
 					ReaderData readerData =3D searchIndexReaderSemaphores.get( outOfDateR=
eader );
 					if ( readerData =3D=3D null ) {
@@ -183,7 +185,7 @@
 			directoryProviderLock.unlock();
 		}
 		if ( closeOutOfDateReader ) {
-			if ( trace ) log.trace( "Closing out of date IndexReader " + outOfDateR=
eader );
+			if ( trace ) log.trace( "Closing out of date IndexReader {}", outOfDate=
Reader );
 			try {
 				outOfDateReader.close();
 			}
@@ -192,7 +194,7 @@
 			}
 		}
 		if ( closeOldReader ) {
-			if ( trace ) log.trace( "Closing old IndexReader " + oldReader );
+			if ( trace ) log.trace( "Closing old IndexReader {}", oldReader );
 			try {
 				oldReader.close();
 			}
@@ -215,7 +217,7 @@
 			catch (IllegalAccessException e) {
 				throw new SearchException( "Incompatible version of Lucene: MultiReade=
r.subReaders not accessible", e );
 			}
-			if ( trace ) log.trace( "Closing MultiReader: " + reader );
+			if ( trace ) log.trace( "Closing MultiReader: {}", reader );
 		}
 		else {
 			throw new AssertionFailure( "Everything should be wrapped in a MultiRea=
der" );
@@ -233,7 +235,7 @@
 			}
 =

 			if ( readerData =3D=3D null ) {
-				log.error( "Trying to close a Lucene IndexReader not present: " + subR=
eader.directory().toString() );
+				log.error( "Trying to close a Lucene IndexReader not present: {}", sub=
Reader.directory() );
 				//TODO should we try to close?
 				continue;
 			}
@@ -245,19 +247,19 @@
 			try {
 				boolean isActive;
 				isActive =3D activeSearchIndexReaders.get( readerData.provider ) =3D=
=3D subReader;
-				if ( trace ) log.trace( "Indexreader not active: " + subReader );
+				if ( trace ) log.trace( "Indexreader not active: {}", subReader );
 				semaphoreIndexReaderLock.lock();
 				try {
 					readerData =3D searchIndexReaderSemaphores.get( subReader );
 					if ( readerData =3D=3D null ) {
-						log.error( "Trying to close a Lucene IndexReader not present: " + su=
bReader.directory().toString() );
+						log.error( "Trying to close a Lucene IndexReader not present: {}" + =
subReader.directory() );
 						//TODO should we try to close?
 						continue;
 					}
 					readerData.semaphore--;
-					if ( trace ) log.trace( "Semaphore decreased to: " + readerData.semap=
hore + " for " + subReader );
+					if ( trace ) log.trace( "Semaphore decreased to: {} for {}", readerDa=
ta.semaphore, subReader );
 					if ( readerData.semaphore < 0 )
-						log.error( "Semaphore negative: " + subReader.directory().toString()=
 );
+						log.error( "Semaphore negative: {}", subReader.directory() );
 					if ( ( !isActive ) && readerData.semaphore =3D=3D 0 ) {
 						searchIndexReaderSemaphores.remove( subReader );
 						closeReader =3D true;
@@ -275,7 +277,7 @@
 			}
 =

 			if ( closeReader ) {
-				if ( trace ) log.trace( "Closing IndexReader: " + subReader );
+				if ( trace ) log.trace( "Closing IndexReader: {}", subReader );
 				try {
 					subReader.close();
 				}

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -7,12 +7,12 @@
 =

 import org.hibernate.search.SearchException;
 import org.hibernate.annotations.common.util.StringHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.FSDirectory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * @author Emmanuel Bernard
@@ -20,7 +20,7 @@
  */
 public class DirectoryProviderHelper {
 	=

-	private static final Log log =3D LogFactory.getLog( DirectoryProviderHelp=
er.class );
+	private static final Logger log =3D LoggerFactory.getLogger( DirectoryPro=
viderHelper.class );
 	private static final String ROOTINDEX_PROP_NAME =3D "sourceBase";
 	private static final String RELATIVEINDEX_PROP_NAME =3D "source";
 =

@@ -38,8 +38,11 @@
 		File sourceDirectory;
 		if ( log.isTraceEnabled() ) {
 			log.trace(
-					"Guess source directory from " + ROOTINDEX_PROP_NAME + " " + ( root !=
=3D null ? root : "<null>" )
-							+ " and " + RELATIVEINDEX_PROP_NAME + " " + (relative !=3D null ? r=
elative : "<null>")
+					"Guess source directory from {} {} and {} {}", new Object[] {
+						ROOTINDEX_PROP_NAME,
+						( root !=3D null ? root : "<null>" ),
+						RELATIVEINDEX_PROP_NAME,
+					(relative !=3D null ? relative : "<null>") }
 			);
 		}
 		if ( relative =3D=3D null ) relative =3D directoryProviderName;
@@ -70,7 +73,7 @@
 	public static FSDirectory createFSIndex(File indexDir) throws IOException=
 {
 		FSDirectory fsDirectory =3D FSDirectory.getDirectory( indexDir );
 		if ( ! IndexReader.indexExists( fsDirectory ) ) {
-			log.debug( "Initialize index: '" + indexDir.getAbsolutePath() + "'" );
+			log.debug( "Initialize index: '{}'", indexDir.getAbsolutePath() );
 			IndexWriter iw =3D new IndexWriter( fsDirectory, new StandardAnalyzer()=
, true );
 			iw.close();
 		}
@@ -136,7 +139,7 @@
 		} catch (NumberFormatException nfe) {
 			throw new SearchException( "Unable to initialize index: " + directoryPr=
oviderName +"; refresh period is not numeric.", nfe );
 		}
-		log.debug( "Refresh period " + period + " seconds" );
+		log.debug( "Refresh period: {} seconds", period );
 		return period * 1000; //per second
 	}
 	=


Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirector=
yProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvi=
der.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvi=
der.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -11,11 +11,11 @@
 import java.io.IOException;
 =

 import org.apache.lucene.store.FSDirectory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 =

 /**
  * File based DirectoryProvider that takes care of index copy
@@ -31,7 +31,7 @@
 //TODO rename copy?
 public class FSMasterDirectoryProvider implements DirectoryProvider<FSDire=
ctory> {
 	=

-	private static Log log =3D LogFactory.getLog( FSMasterDirectoryProvider.c=
lass );
+	private final Logger log =3D LoggerFactory.getLogger( FSMasterDirectoryPr=
ovider.class );
 	=

 	private FSDirectory directory;
 	private int current;
@@ -50,9 +50,9 @@
 		this.directoryProviderName =3D directoryProviderName;
 		//source guessing
 		sourceDir =3D DirectoryProviderHelper.getSourceDirectory( directoryProvi=
derName, properties, true );
-		log.debug( "Source directory: " + sourceDir.getPath() );
+		log.debug( "Source directory: {}", sourceDir.getPath() );
 		indexDir =3D DirectoryProviderHelper.getVerifiedIndexDir( directoryProvi=
derName, properties, true );
-		log.debug( "Index directory: " + indexDir.getPath() );
+		log.debug( "Index directory: {}", indexDir.getPath() );
 		try {
 			indexName =3D indexDir.getCanonicalPath();
 			directory =3D DirectoryProviderHelper.createFSIndex( indexDir );
@@ -74,7 +74,7 @@
 				current =3D 1;
 			}
 			else {
-				log.debug( "Source directory for '" + indexName + "' will be initializ=
ed");
+				log.debug( "Source directory for '{}' will be initialized", indexName);
 				current =3D 1;
 			}
 			String currentString =3D Integer.valueOf( current ).toString();
@@ -84,7 +84,7 @@
 			new File( sourceDir, "current2" ).delete();
 			//TODO small hole, no file can be found here
 			new File( sourceDir, "current" + currentString ).createNewFile();
-			log.debug( "Current directory: " + current );
+			log.debug( "Current directory: {}", current );
 		}
 		catch (IOException e) {
 			throw new SearchException( "Unable to initialize index: " + directoryPr=
oviderName, e );
@@ -132,7 +132,7 @@
 				executor.execute( copyTask );
 			}
 			else {
-				log.info( "Skipping directory synchronization, previous work still in =
progress: " + indexName );
+				log.info( "Skipping directory synchronization, previous work still in =
progress: {}", indexName );
 			}
 		}
 	}
@@ -167,7 +167,7 @@
 				File destinationFile =3D new File(destination, Integer.valueOf(index).=
toString() );
 				//TODO make smart a parameter
 				try {
-					log.trace( "Copying " + source + " into " + destinationFile );
+					log.trace( "Copying {} into {}", source, destinationFile );
 					FileHelper.synchronize( source, destinationFile, true );
 					current =3D index;
 				}
@@ -178,7 +178,7 @@
 					return;
 				}
 				if ( ! new File( destination, "current" + oldIndex ).delete() ) {
-					log.warn( "Unable to remove previous marker file from source of " + i=
ndexName );
+					log.warn( "Unable to remove previous marker file from source of {}", =
indexName );
 				}
 				try {
 					new File( destination, "current" + index ).createNewFile();
@@ -191,7 +191,7 @@
 				directoryProviderLock.unlock();
 				inProgress =3D false;
 			}
-			log.trace( "Copy for " + indexName + " took " + (System.currentTimeMill=
is() - start) + " ms" );
+			log.trace( "Copy for {} took {} ms", indexName, (System.currentTimeMill=
is() - start) );
 		}
 	}
 =


Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectory=
Provider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvid=
er.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvid=
er.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -10,12 +10,12 @@
 import java.io.IOException;
 =

 import org.apache.lucene.store.FSDirectory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * File based directory provider that takes care of getting a version of t=
he index
@@ -31,7 +31,7 @@
  */
 public class FSSlaveDirectoryProvider implements DirectoryProvider<FSDirec=
tory> {
 	=

-	private static Log log =3D LogFactory.getLog( FSSlaveDirectoryProvider.cl=
ass );
+	private final Logger log =3D LoggerFactory.getLogger( FSSlaveDirectoryPro=
vider.class );
 	=

 	private FSDirectory directory1;
 	private FSDirectory directory2;
@@ -53,9 +53,9 @@
 		if ( ! new File( sourceIndexDir, "current1" ).exists() && ! new File( so=
urceIndexDir, "current2" ).exists() ) {
 			throw new IllegalStateException( "No current marker in source directory=
" );
 		}
-		log.debug( "Source directory: " + sourceIndexDir.getPath() );
+		log.debug( "Source directory: {}", sourceIndexDir.getPath() );
 		indexDir =3D DirectoryProviderHelper.getVerifiedIndexDir( directoryProvi=
derName, properties, true );
-		log.debug( "Index directory: " + indexDir.getPath() );
+		log.debug( "Index directory: {}", indexDir.getPath() );
 		try {
 			indexName =3D indexDir.getCanonicalPath();
 		}
@@ -105,7 +105,7 @@
 					throw new SearchException( "Unable to create the directory marker fil=
e: " + indexName );
 				}
 			}
-			log.debug( "Current directory: " + current);
+			log.debug( "Current directory: {}", current);
 		}
 		catch (IOException e) {
 			throw new SearchException( "Unable to initialize index: " + directoryPr=
oviderName, e );
@@ -162,7 +162,7 @@
 				executor.execute( copyTask );
 			}
 			else {
-				log.trace( "Skipping directory synchronization, previous work still in=
 progress: " + indexName);
+				log.trace( "Skipping directory synchronization, previous work still in=
 progress: {}", indexName);
 			}
 		}
 	}
@@ -199,7 +199,7 @@
 				File destinationFile =3D new File( destination, Integer.valueOf( index=
 ).toString() );
 				//TODO make smart a parameter
 				try {
-					log.trace( "Copying " + sourceFile + " into " + destinationFile );
+					log.trace( "Copying {} into {}", sourceFile, destinationFile );
 					FileHelper.synchronize( sourceFile, destinationFile, true );
 					current =3D index;
 				}
@@ -222,7 +222,7 @@
 			finally {
 				inProgress =3D false;
 			}
-			log.trace( "Copy for " + indexName + " took " + (System.currentTimeMill=
is() - start) + " ms" );
+			log.trace( "Copy for {} took {} ms", indexName, (System.currentTimeMill=
is() - start) );
 		}
 	}
 =


Modified: search/trunk/src/java/org/hibernate/search/store/optimization/Inc=
rementalOptimizerStrategy.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/optimization/Increment=
alOptimizerStrategy.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/java/org/hibernate/search/store/optimization/Increment=
alOptimizerStrategy.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -10,8 +10,8 @@
 import org.hibernate.search.SearchException;
 import org.hibernate.annotations.common.util.StringHelper;
 import org.apache.lucene.index.IndexWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Optimization strategy triggered after a certain amount of operations
@@ -24,7 +24,7 @@
 	private long operations =3D 0;
 	private long transactions =3D 0;
 	private DirectoryProvider directoryProvider;
-	private Log log =3D LogFactory.getLog( IncrementalOptimizerStrategy.class=
 );
+	private final Logger log =3D LoggerFactory.getLogger( IncrementalOptimize=
rStrategy.class );
 =

 	public void initialize(DirectoryProvider directoryProvider, Properties in=
dexProperties, SearchFactoryImplementor searchFactoryImplementor) {
 		this.directoryProvider =3D directoryProvider;
@@ -56,11 +56,8 @@
 =

 	public void optimize(Workspace workspace) {
 		if ( needOptimization() ) {
-			if ( log.isDebugEnabled() ) {
-				log.debug( "Optimize "
-				 	+ directoryProvider.getDirectory().toString()
-					+" after " + operations + " operations and " + transactions + " trans=
actions");
-			}
+			log.debug( "Optimize {} after {} operations and {} transactions",
+				new Object[] { directoryProvider.getDirectory(), operations, transacti=
ons });
 			IndexWriter writer =3D workspace.getIndexWriter( directoryProvider );
 			try {
 				writer.optimize();

Modified: search/trunk/src/test/org/hibernate/search/test/embedded/doublein=
sert/Contact.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/C=
ontact.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/C=
ontact.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorColumn;
@@ -22,8 +21,6 @@
 =

 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
 import org.hibernate.annotations.Type;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
@@ -40,8 +37,6 @@
 @Indexed
 public class Contact  implements Serializable {
 =

-	private static Log logger =3D LogFactory.getLog(Contact.class);
-
     private static final long serialVersionUID =3D 1L;
 =

     @Id @GeneratedValue(strategy=3DGenerationType.AUTO)

Modified: search/trunk/src/test/org/hibernate/search/test/query/LuceneQuery=
SortTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTe=
st.java	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/test/org/hibernate/search/test/query/LuceneQuerySortTe=
st.java	2008-05-17 12:54:06 UTC (rev 14674)
@@ -4,8 +4,6 @@
 import java.util.List;
 import java.util.Calendar;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
@@ -14,7 +12,6 @@
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.Version;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.test.SearchTestCase;
 =

@@ -25,11 +22,6 @@
 public class LuceneQuerySortTest extends SearchTestCase {
 =

 	/**
-	 * Class logger.
-	 */
-	private static Log log =3D LogFactory.getLog( Version.class );
-
-	/**
 	 * Test that we can change the default sort order of the lucene search re=
sult.
 	 *
 	 * @throws Exception in case the test fails.

Modified: search/trunk/src/test/org/hibernate/search/test/query/TermVectorT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.ja=
va	2008-05-17 12:52:14 UTC (rev 14673)
+++ search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.ja=
va	2008-05-17 12:54:06 UTC (rev 14674)
@@ -1,7 +1,5 @@
 package org.hibernate.search.test.query;
 =

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.TermPositionVector;
 import org.apache.lucene.index.TermVectorOffsetInfo;
@@ -17,8 +15,7 @@
  * @author John Griffin
  */
 public class TermVectorTest extends SearchTestCase {
-   private static Log log =3D LogFactory.getLog(TermVectorTest.class);
-
+   =

    public void testPositionOffsets() throws Exception {
       FullTextSession s =3D Search.createFullTextSession(openSession());
       createIndex(s);


--===============3159337642337367567==--

From hibernate-commits at lists.jboss.org Mon May 19 11:22:26 2008
Content-Type: multipart/mixed; boundary="===============6551752886009568033=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14675 -
 branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x.
Date: Mon, 19 May 2008 11:22:26 -0400
Message-ID: <E1Jy7By-0008By-Kx@committer01.frg.pub.inap.atl.jboss.com>

--===============6551752886009568033==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: max.andersen(a)jboss.com
Date: 2008-05-19 11:22:26 -0400 (Mon, 19 May 2008)
New Revision: 14675

Modified:
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x=
/Hbm2DDLExporter.java
Log:
JBIDE-2232 BuildException

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/too=
l/hbm2x/Hbm2DDLExporter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2=
x/Hbm2DDLExporter.java	2008-05-17 12:54:06 UTC (rev 14674)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2=
x/Hbm2DDLExporter.java	2008-05-19 15:22:26 UTC (rev 14675)
@@ -13,7 +13,6 @@
 import java.io.File;
 import java.util.Iterator;
 =

-import org.apache.tools.ant.BuildException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
@@ -100,9 +99,9 @@
 					log.warn("Error #" + i + ": ", element);
 =

 				}
-				log.error(i - 1 + " occurred while performing Hbm2DDLExporter.");
+				log.error(i - 1 + " errors occurred while performing Hbm2DDLExporter."=
);
 				if (haltOnError) {
-					throw new BuildException(
+					throw new ExporterException(
 							"Errors while performing Hbm2DDLExporter");
 				}
 			}


--===============6551752886009568033==--

From hibernate-commits at lists.jboss.org Tue May 20 02:44:02 2008
Content-Type: multipart/mixed; boundary="===============7471102840055533805=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14676 - in
 core/branches/Branch_3_2_4_SP1_CP: src/org/hibernate/loader and 2 other
 directories.
Date: Tue, 20 May 2008 02:44:01 -0400
Message-ID: <E1JyLZp-0008OD-Cl@committer01.frg.pub.inap.atl.jboss.com>

--===============7471102840055533805==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: anthonyHib
Date: 2008-05-20 02:44:01 -0400 (Tue, 20 May 2008)
New Revision: 14676

Modified:
   core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/SubqueryEx=
pression.java
   core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/AbstractEntit=
yJoinWalker.java
   core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/criteria/Crit=
eriaJoinWalker.java
   core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/criteria/Crite=
riaQueryTest.java
Log:
fix for JBPAPP-838/HHH-957/HHH-952

Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/Sub=
queryExpression.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/SubqueryE=
xpression.java	2008-05-19 15:22:26 UTC (rev 14675)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/criterion/SubqueryE=
xpression.java	2008-05-20 06:44:01 UTC (rev 14676)
@@ -1,17 +1,18 @@
 //$Id$
 package org.hibernate.criterion;
 =

+import java.util.HashMap;
+
 import org.hibernate.Criteria;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.QueryParameters;
 import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.TypedValue;
 import org.hibernate.impl.CriteriaImpl;
+import org.hibernate.loader.criteria.CriteriaJoinWalker;
 import org.hibernate.loader.criteria.CriteriaQueryTranslator;
 import org.hibernate.persister.entity.OuterJoinLoadable;
-import org.hibernate.sql.Select;
 import org.hibernate.type.Type;
 =

 /**
@@ -24,7 +25,8 @@
 	private String op;
 	private QueryParameters params;
 	private Type[] types;
-	=

+	private CriteriaQueryTranslator innerQuery;
+
 	protected Type[] getTypes() {
 		return types;
 	}
@@ -39,34 +41,23 @@
 =

 	public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery)
 	throws HibernateException {
-		=

-		final SessionImplementor session =3D ( (CriteriaImpl) criteria ).getSess=
ion(); //ugly!
-		final SessionFactoryImplementor factory =3D session.getFactory();
-		=

+
+		final SessionFactoryImplementor factory =3D criteriaQuery.getFactory();
 		final OuterJoinLoadable persister =3D (OuterJoinLoadable) factory.getEnt=
ityPersister( criteriaImpl.getEntityOrClassName() );
-		CriteriaQueryTranslator innerQuery =3D new CriteriaQueryTranslator( =

-				factory, =

-				criteriaImpl, =

-				criteriaImpl.getEntityOrClassName(), //implicit polymorphism not suppo=
rted (would need a union) =

-				criteriaQuery.generateSQLAlias(),
-				criteriaQuery
-			);
+
+		createAndSetInnerQuery( criteriaQuery, factory );
 		=

-		params =3D innerQuery.getQueryParameters(); //TODO: bad lifecycle....
-		types =3D innerQuery.getProjectedTypes();
-		=

-		//String filter =3D persister.filterFragment( innerQuery.getRootSQLALias=
(), session.getEnabledFilters() );
-		=

-		String sql =3D new Select( factory.getDialect() )
-			.setWhereClause( innerQuery.getWhereCondition() )
-			.setGroupByClause( innerQuery.getGroupBy() )
-			.setSelectClause( innerQuery.getSelect() )
-			.setFromClause(
-					persister.fromTableFragment( innerQuery.getRootSQLALias() ) +   =

-					persister.fromJoinFragment( innerQuery.getRootSQLALias(), true, false=
 )
-				)
-			.toStatementString();
-		=

+		CriteriaJoinWalker walker =3D new CriteriaJoinWalker(
+				persister,
+				innerQuery,
+				factory,
+				criteriaImpl,
+				criteriaImpl.getEntityOrClassName(),
+				new HashMap(),
+				innerQuery.getRootSQLALias());
+
+		String sql =3D walker.getSQLString();
+
 		final StringBuffer buf =3D new StringBuffer()
 			.append( toLeftSqlString(criteria, criteriaQuery) );
 		if (op!=3Dnull) buf.append(' ').append(op).append(' ');
@@ -77,13 +68,49 @@
 =

 	public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery crite=
riaQuery) =

 	throws HibernateException {
-		Type[] types =3D params.getPositionalParameterTypes();
-		Object[] values =3D params.getPositionalParameterValues();
-		TypedValue[] tv =3D new TypedValue[types.length];
-		for ( int i=3D0; i<types.length; i++ ) {
-			tv[i] =3D new TypedValue( types[i], values[i], EntityMode.POJO );
+		//the following two lines were added to ensure that this.params is not n=
ull, which
+		//can happen with two-deep nested subqueries
+		SessionFactoryImplementor factory =3D criteriaQuery.getFactory();
+		createAndSetInnerQuery(criteriaQuery, factory);
+		=

+		Type[] ppTypes =3D params.getPositionalParameterTypes();
+		Object[] ppValues =3D params.getPositionalParameterValues();
+		TypedValue[] tv =3D new TypedValue[ppTypes.length];
+		for ( int i=3D0; i<ppTypes.length; i++ ) {
+			tv[i] =3D new TypedValue( ppTypes[i], ppValues[i], EntityMode.POJO );
 		}
 		return tv;
 	}
 =

+	/**
+	 * Creates the inner query used to extract some useful information about
+	 * types, since it is needed in both methods.
+	 * @param criteriaQuery
+	 * @param factory
+	 */
+	private void createAndSetInnerQuery(CriteriaQuery criteriaQuery, final Se=
ssionFactoryImplementor factory) {
+		if ( innerQuery =3D=3D null ) {
+			//with two-deep subqueries, the same alias would get generated for
+			//both using the old method (criteriaQuery.generateSQLAlias()), so
+			//that is now used as a fallback if the main criteria alias isn't set
+			String alias;
+			if ( this.criteriaImpl.getAlias() =3D=3D null ) {
+				alias =3D criteriaQuery.generateSQLAlias();
+			}
+			else {
+				alias =3D this.criteriaImpl.getAlias() + "_";
+			}
+
+			innerQuery =3D new CriteriaQueryTranslator(
+					factory,
+					criteriaImpl,
+					criteriaImpl.getEntityOrClassName(), //implicit polymorphism not supp=
orted (would need a union)
+					alias,
+					criteriaQuery
+				);
+
+			params =3D innerQuery.getQueryParameters();
+			types =3D innerQuery.getProjectedTypes();
+		}
+	}
 }

Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/Abstra=
ctEntityJoinWalker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/AbstractEnti=
tyJoinWalker.java	2008-05-19 15:22:26 UTC (rev 14675)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/AbstractEnti=
tyJoinWalker.java	2008-05-20 06:44:01 UTC (rev 14676)
@@ -26,12 +26,16 @@
 public abstract class AbstractEntityJoinWalker extends JoinWalker {
 =

 	private final OuterJoinLoadable persister;
-	private String alias;
+	private final String alias;
 =

 	public AbstractEntityJoinWalker(OuterJoinLoadable persister, SessionFacto=
ryImplementor factory, Map enabledFilters) {
+		this( persister, factory, enabledFilters, null );
+	}
+
+	public AbstractEntityJoinWalker(OuterJoinLoadable persister, SessionFacto=
ryImplementor factory, Map enabledFilters, String alias) {
 		super( factory, enabledFilters );
 		this.persister =3D persister;
-		alias =3D generateRootAlias( persister.getEntityName() );
+		this.alias =3D ( alias =3D=3D null ) ? generateRootAlias( persister.getE=
ntityName() ) : alias;
 	}
 =

 	protected final void initAll(
@@ -39,9 +43,7 @@
 		final String orderByString,
 		final LockMode lockMode)
 	throws MappingException {
-
 		walkEntityTree( persister, getAlias() );
-
 		List allAssociations =3D new ArrayList();
 		allAssociations.addAll(associations);
 		allAssociations.add( new OuterJoinableAssociation(

Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/criter=
ia/CriteriaJoinWalker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/criteria/Cri=
teriaJoinWalker.java	2008-05-19 15:22:26 UTC (rev 14675)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/loader/criteria/Cri=
teriaJoinWalker.java	2008-05-20 06:44:01 UTC (rev 14676)
@@ -8,7 +8,6 @@
 =

 import org.hibernate.Criteria;
 import org.hibernate.FetchMode;
-import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.engine.CascadeStyle;
@@ -18,7 +17,6 @@
 import org.hibernate.persister.entity.Joinable;
 import org.hibernate.persister.entity.OuterJoinLoadable;
 import org.hibernate.persister.entity.Queryable;
-import org.hibernate.sql.JoinFragment;
 import org.hibernate.type.AssociationType;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeFactory;
@@ -57,10 +55,20 @@
 			final SessionFactoryImplementor factory, =

 			final CriteriaImpl criteria, =

 			final String rootEntityName,
-			final Map enabledFilters)
-	throws HibernateException {
-		super(persister, factory, enabledFilters);
+			final Map enabledFilters) {
+		this(persister, translator, factory, criteria, rootEntityName, enabledFi=
lters, null);
+	}
 =

+	public CriteriaJoinWalker(
+			final OuterJoinLoadable persister,
+			final CriteriaQueryTranslator translator,
+			final SessionFactoryImplementor factory,
+			final CriteriaImpl criteria,
+			final String rootEntityName,
+			final Map enabledFilters,
+			final String alias) {
+		super(persister, factory, enabledFilters, alias);
+
 		this.translator =3D translator;
 =

 		querySpaces =3D translator.getQuerySpaces();

Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/criteri=
a/CriteriaQueryTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/criteria/Crit=
eriaQueryTest.java	2008-05-19 15:22:26 UTC (rev 14675)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/criteria/Crit=
eriaQueryTest.java	2008-05-20 06:44:01 UTC (rev 14676)
@@ -16,7 +16,6 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Example;
-import org.hibernate.criterion.Expression;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projection;
@@ -154,8 +153,8 @@
 			.list();
 	=

 		session.createCriteria(Student.class)
-		.add( Property.forName("name").eqAll(dc) )
-		.list();
+			.add( Property.forName("name").eqAll(dc) )
+			.list();
 	=

 		session.createCriteria(Student.class)
 			.add( Subqueries.in("Gavin King", dc) )
@@ -169,8 +168,7 @@
 			.add( Subqueries.eq("Gavin King", dc2) )
 			.list();
 =

-		//TODO: join in subselect: HHH-952
-		/*DetachedCriteria dc3 =3D DetachedCriteria.forClass(Student.class, "st")
+		DetachedCriteria dc3 =3D DetachedCriteria.forClass(Student.class, "st")
 			.createCriteria("enrolments")
 				.createCriteria("course")
 					.add( Property.forName("description").eq("Hibernate Training") )
@@ -178,7 +176,7 @@
 	=

 		session.createCriteria(Enrolment.class, "e")
 			.add( Subqueries.eq("Gavin King", dc3) )
-			.list();*/
+			.list();
 =

 		session.delete(enrolment2);
 		session.delete(gavin);
@@ -225,110 +223,130 @@
 		session.close();
 	}
 	=

-		public void testProjectionCache() {
-			Session s =3D openSession();
-			Transaction t =3D s.beginTransaction();
-			=

-			Course course =3D new Course();
-			course.setCourseCode("HIB");
-			course.setDescription("Hibernate Training");
-			s.save(course);
-			=

-			Student gavin =3D new Student();
-			gavin.setName("Gavin King");
-			gavin.setStudentNumber(666);
-			s.save(gavin);
-			=

-			Student xam =3D new Student();
-			xam.setName("Max Rydahl Andersen");
-			xam.setStudentNumber(101);
-			s.save(xam);
-			=

-			Enrolment enrolment1 =3D new Enrolment();
-			enrolment1.setCourse(course);
-			enrolment1.setCourseCode(course.getCourseCode());
-			enrolment1.setSemester((short) 1);
-			enrolment1.setYear((short) 1999);
-			enrolment1.setStudent(xam);
-			enrolment1.setStudentNumber(xam.getStudentNumber());
-			xam.getEnrolments().add(enrolment1);
-			s.save(enrolment1);
-			=

-			Enrolment enrolment2 =3D new Enrolment();
-			enrolment2.setCourse(course);
-			enrolment2.setCourseCode(course.getCourseCode());
-			enrolment2.setSemester((short) 3);
-			enrolment2.setYear((short) 1998);
-			enrolment2.setStudent(gavin);
-			enrolment2.setStudentNumber(gavin.getStudentNumber());
-			gavin.getEnrolments().add(enrolment2);
-			s.save(enrolment2);
-			=

-			List list =3D s.createCriteria(Enrolment.class)
-				.createAlias("student", "s")
-				.createAlias("course", "c")
-				.add( Restrictions.isNotEmpty("s.enrolments") )
-				.setProjection( Projections.projectionList()
-						.add( Projections.property("s.name") )
-						.add( Projections.property("c.description") )
-				)
-				.setCacheable(true)
-				.list();
-			=

-			assertEquals( list.size(), 2 );
-			assertEquals( ( (Object[]) list.get(0) ).length, 2 );
-			assertEquals( ( (Object[]) list.get(1) ).length, 2 );
-			=

-			t.commit();
-			s.close();
+	// test for HHH-957/JBPAPP-838
+	public void testDetachedCriteriaAsSubQuery() {
+		=

+		DetachedCriteria subselect =3D DetachedCriteria.forClass(Course.class);
+		subselect.add(Restrictions.like("description","test",MatchMode.START)).s=
etProjection(Projections.property("courseCode"));
+
+		DetachedCriteria mainselect =3D DetachedCriteria.forClass(Enrolment.clas=
s);
+		mainselect.createCriteria("student").add(Subqueries.in("preferredCourse"=
,subselect));
+
+		=

+		Session session =3D openSession();
+		Transaction t =3D session.beginTransaction();
+		=

+		mainselect.getExecutableCriteria(session).list();
+		=

+		t.commit();
+		session.close();
+	}
+
+
+	public void testProjectionCache() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+		=

+		Course course =3D new Course();
+		course.setCourseCode("HIB");
+		course.setDescription("Hibernate Training");
+		s.save(course);
+		=

+		Student gavin =3D new Student();
+		gavin.setName("Gavin King");
+		gavin.setStudentNumber(666);
+		s.save(gavin);
+		=

+		Student xam =3D new Student();
+		xam.setName("Max Rydahl Andersen");
+		xam.setStudentNumber(101);
+		s.save(xam);
+		=

+		Enrolment enrolment1 =3D new Enrolment();
+		enrolment1.setCourse(course);
+		enrolment1.setCourseCode(course.getCourseCode());
+		enrolment1.setSemester((short) 1);
+		enrolment1.setYear((short) 1999);
+		enrolment1.setStudent(xam);
+		enrolment1.setStudentNumber(xam.getStudentNumber());
+		xam.getEnrolments().add(enrolment1);
+		s.save(enrolment1);
+		=

+		Enrolment enrolment2 =3D new Enrolment();
+		enrolment2.setCourse(course);
+		enrolment2.setCourseCode(course.getCourseCode());
+		enrolment2.setSemester((short) 3);
+		enrolment2.setYear((short) 1998);
+		enrolment2.setStudent(gavin);
+		enrolment2.setStudentNumber(gavin.getStudentNumber());
+		gavin.getEnrolments().add(enrolment2);
+		s.save(enrolment2);
+		=

+		List list =3D s.createCriteria(Enrolment.class)
+			.createAlias("student", "s")
+			.createAlias("course", "c")
+			.add( Restrictions.isNotEmpty("s.enrolments") )
+			.setProjection( Projections.projectionList()
+					.add( Projections.property("s.name") )
+					.add( Projections.property("c.description") )
+			)
+			.setCacheable(true)
+			.list();
+		=

+		assertEquals( list.size(), 2 );
+		assertEquals( ( (Object[]) list.get(0) ).length, 2 );
+		assertEquals( ( (Object[]) list.get(1) ).length, 2 );
+		=

+		t.commit();
+		s.close();
+
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		s.createCriteria(Enrolment.class)
+			.createAlias("student", "s")
+			.createAlias("course", "c")
+			.add( Restrictions.isNotEmpty("s.enrolments") )
+			.setProjection( Projections.projectionList()
+					.add( Projections.property("s.name") )
+					.add( Projections.property("c.description") )
+			)
+			.setCacheable(true)
+			.list();
 	=

-			s =3D openSession();
-			t =3D s.beginTransaction();
-			=

-			s.createCriteria(Enrolment.class)
-				.createAlias("student", "s")
-				.createAlias("course", "c")
-				.add( Restrictions.isNotEmpty("s.enrolments") )
-				.setProjection( Projections.projectionList()
-						.add( Projections.property("s.name") )
-						.add( Projections.property("c.description") )
-				)
-				.setCacheable(true)
-				.list();
+		assertEquals( list.size(), 2 );
+		assertEquals( ( (Object[]) list.get(0) ).length, 2 );
+		assertEquals( ( (Object[]) list.get(1) ).length, 2 );
 		=

-			assertEquals( list.size(), 2 );
-			assertEquals( ( (Object[]) list.get(0) ).length, 2 );
-			assertEquals( ( (Object[]) list.get(1) ).length, 2 );
-			=

-			t.commit();
-			s.close();
+		t.commit();
+		s.close();
+
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		s.createCriteria(Enrolment.class)
+			.createAlias("student", "s")
+			.createAlias("course", "c")
+			.add( Restrictions.isNotEmpty("s.enrolments") )
+			.setProjection( Projections.projectionList()
+					.add( Projections.property("s.name") )
+					.add( Projections.property("c.description") )
+			)
+			.setCacheable(true)
+			.list();
+		=

+		assertEquals( list.size(), 2 );
+		assertEquals( ( (Object[]) list.get(0) ).length, 2 );
+		assertEquals( ( (Object[]) list.get(1) ).length, 2 );
+		=

+		s.delete(enrolment1);
+		s.delete(enrolment2);
+		s.delete(course);
+		s.delete(gavin);
+		s.delete(xam);
 	=

-			s =3D openSession();
-			t =3D s.beginTransaction();
-			=

-			s.createCriteria(Enrolment.class)
-				.createAlias("student", "s")
-				.createAlias("course", "c")
-				.add( Restrictions.isNotEmpty("s.enrolments") )
-				.setProjection( Projections.projectionList()
-						.add( Projections.property("s.name") )
-						.add( Projections.property("c.description") )
-				)
-				.setCacheable(true)
-				.list();
-			=

-			assertEquals( list.size(), 2 );
-			assertEquals( ( (Object[]) list.get(0) ).length, 2 );
-			assertEquals( ( (Object[]) list.get(1) ).length, 2 );
-			=

-			s.delete(enrolment1);
-			s.delete(enrolment2);
-			s.delete(course);
-			s.delete(gavin);
-			s.delete(xam);
-		=

-			t.commit();
-			s.close();
+		t.commit();
+		s.close();
 	}
 	=

 	public void testProjections() {
@@ -398,8 +416,8 @@
 					.add( Projections.property("studentNumber"), "stNumber" )
 					.add( Projections.property("courseCode"), "cCode" ) )
 			)
-		    .add( Expression.gt( "studentNumber", new Long(665) ) )
-		    .add( Expression.lt( "studentNumber", new Long(668) ) )
+		    .add( Restrictions.gt( "studentNumber", new Long(665) ) )
+		    .add( Restrictions.lt( "studentNumber", new Long(668) ) )
 		    .addOrder( Order.asc("stNumber") )
 			.setResultTransformer(Criteria.ALIAS_TO_ENTITY_MAP)
 			.list();
@@ -797,4 +815,3 @@
 		session.close();
 	}
 }
-


--===============7471102840055533805==--

From hibernate-commits at lists.jboss.org Wed May 21 14:20:50 2008
Content-Type: multipart/mixed; boundary="===============2461790096998563935=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14677 - cglib and 2 other
 directories.
Date: Wed, 21 May 2008 14:20:50 -0400
Message-ID: <E1Jysvi-0001aD-Dq@committer01.frg.pub.inap.atl.jboss.com>

--===============2461790096998563935==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 14:20:50 -0400 (Wed, 21 May 2008)
New Revision: 14677

Added:
   cglib/
   cglib/branches/
   cglib/tags/
   cglib/trunk/
   cglib/trunk/hibernate-cglib-repack.ipr
   cglib/trunk/hibernate-cglib-repack.iws
   cglib/trunk/pom.xml
   cglib/trunk/target/
   cglib/trunk/target/dependency-reduced-pom.xml
   cglib/trunk/target/hibernate-cglib-repack-2.1_3.jar
   cglib/trunk/target/original-hibernate-cglib-repack-2.1_3.jar
Log:
Importing cglib repackaging project

Added: cglib/trunk/hibernate-cglib-repack.ipr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/hibernate-cglib-repack.ipr	                        (rev 0)
+++ cglib/trunk/hibernate-cglib-repack.ipr	2008-05-21 18:20:50 UTC (rev 146=
77)
@@ -0,0 +1,304 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<project relativePaths=3D"false" version=3D"4">
+  <component name=3D"AntConfiguration">
+    <defaultAnt bundledAnt=3D"true" />
+  </component>
+  <component name=3D"BuildJarProjectSettings">
+    <option name=3D"BUILD_JARS_ON_MAKE" value=3D"false" />
+  </component>
+  <component name=3D"CodeStyleProjectProfileManger">
+    <option name=3D"PROJECT_PROFILE" />
+    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
+  </component>
+  <component name=3D"CodeStyleSettingsManager">
+    <option name=3D"PER_PROJECT_SETTINGS" />
+    <option name=3D"USE_PER_PROJECT_SETTINGS" value=3D"false" />
+  </component>
+  <component name=3D"CompilerConfiguration">
+    <option name=3D"DEFAULT_COMPILER" value=3D"Javac" />
+    <option name=3D"DEPLOY_AFTER_MAKE" value=3D"0" />
+    <resourceExtensions>
+      <entry name=3D".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=3D".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name=3D"?*.properties" />
+      <entry name=3D"?*.xml" />
+      <entry name=3D"?*.gif" />
+      <entry name=3D"?*.png" />
+      <entry name=3D"?*.jpeg" />
+      <entry name=3D"?*.jpg" />
+      <entry name=3D"?*.html" />
+      <entry name=3D"?*.dtd" />
+      <entry name=3D"?*.tld" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name=3D"DependenciesAnalyzeManager">
+    <option name=3D"myForwardDirection" value=3D"false" />
+  </component>
+  <component name=3D"DependencyValidationManager">
+    <option name=3D"SKIP_IMPORT_STATEMENTS" value=3D"false" />
+  </component>
+  <component name=3D"EclipseCompilerSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"EclipseEmbeddedCompilerSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"EntryPointsManager">
+    <entry_points version=3D"2.0" />
+  </component>
+  <component name=3D"InspectionProjectProfileManager">
+    <option name=3D"PROJECT_PROFILE" value=3D"Project Default" />
+    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
+    <scopes />
+    <profiles>
+      <profile version=3D"1.0" is_locked=3D"false">
+        <option name=3D"myName" value=3D"Project Default" />
+        <option name=3D"myLocal" value=3D"false" />
+      </profile>
+    </profiles>
+    <list size=3D"0" />
+  </component>
+  <component name=3D"JavacSettings">
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"DEPRECATION" value=3D"true" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
+  </component>
+  <component name=3D"JavadocGenerationManager">
+    <option name=3D"OUTPUT_DIRECTORY" />
+    <option name=3D"OPTION_SCOPE" value=3D"protected" />
+    <option name=3D"OPTION_HIERARCHY" value=3D"true" />
+    <option name=3D"OPTION_NAVIGATOR" value=3D"true" />
+    <option name=3D"OPTION_INDEX" value=3D"true" />
+    <option name=3D"OPTION_SEPARATE_INDEX" value=3D"true" />
+    <option name=3D"OPTION_DOCUMENT_TAG_USE" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_AUTHOR" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_VERSION" value=3D"false" />
+    <option name=3D"OPTION_DOCUMENT_TAG_DEPRECATED" value=3D"true" />
+    <option name=3D"OPTION_DEPRECATED_LIST" value=3D"true" />
+    <option name=3D"OTHER_OPTIONS" value=3D"" />
+    <option name=3D"HEAP_SIZE" />
+    <option name=3D"LOCALE" />
+    <option name=3D"OPEN_IN_BROWSER" value=3D"true" />
+  </component>
+  <component name=3D"JikesSettings">
+    <option name=3D"JIKES_PATH" value=3D"" />
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"DEPRECATION" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"IS_EMACS_ERRORS_MODE" value=3D"true" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+  </component>
+  <component name=3D"MavenImporterState">
+    <option name=3D"autoImport">
+      <set>
+        <option value=3D"$PROJECT_DIR$/pom.xml" />
+      </set>
+    </option>
+  </component>
+  <component name=3D"ProjectFileVersion" converted=3D"true" />
+  <component name=3D"ProjectModuleManager">
+    <modules />
+  </component>
+  <component name=3D"ProjectRootManager" version=3D"2" assert-keyword=3D"t=
rue" jdk-15=3D"true" project-jdk-name=3D"1.5" project-jdk-type=3D"JavaSDK">
+    <output url=3D"file://$PROJECT_DIR$/out" />
+  </component>
+  <component name=3D"ResourceManagerContainer">
+    <option name=3D"myResourceBundles">
+      <value>
+        <list size=3D"0" />
+      </value>
+    </option>
+  </component>
+  <component name=3D"RmicSettings">
+    <option name=3D"IS_EANABLED" value=3D"false" />
+    <option name=3D"DEBUGGING_INFO" value=3D"true" />
+    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
+    <option name=3D"GENERATE_IIOP_STUBS" value=3D"false" />
+    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
+  </component>
+  <component name=3D"VcsDirectoryMappings">
+    <mapping directory=3D"" vcs=3D"" />
+  </component>
+  <component name=3D"copyright">
+    <Base>
+      <setting name=3D"state" value=3D"1" />
+    </Base>
+    <LanguageOptions name=3D"$TEMPLATE$">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Hibernate, Relational Persistence f=
or Idiomatic Java&#10;&#10;Copyright (c) &amp;#36;today.year, Red Hat Middl=
eware LLC or third-party contributors as &#10;indicated by the @author tags=
 or express copyright attribution &#10;statements applied by the authors.  =
All third-party contributions are &#10;distributed under license by Red Hat=
 Middleware LLC.&#10;&#10;This copyrighted material is made available to an=
yone wishing to use, modify,&#10;copy, or redistribute it subject to the te=
rms and conditions of the GNU&#10;Lesser General Public License, as publish=
ed by the Free Software Foundation.&#10;&#10;This program is distributed in=
 the hope that it will be useful, &#10;but WITHOUT ANY WARRANTY; without ev=
en the implied warranty of MERCHANTABILITY &#10;or FITNESS FOR A PARTICULAR=
 PURPOSE.  See the GNU Lesser General Public License&#10;for more details.&=
#10;&#10;You should have received a copy of the GNU Lesser General Public L=
icense&#10;along w!
 ith this distribution; if not, write to:&#10;Free Software Foundation, Inc=
.&#10;51 Franklin Street, Fifth Floor&#10;Boston, MA  02110-1301  USA&#10;"=
 />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"4" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"1" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"HTML">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"2" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"JAVA">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"1" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"JSP">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"2" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"JavaScript">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"1" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"Properties">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"1" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+    <LanguageOptions name=3D"XML">
+      <option name=3D"templateOptions">
+        <value>
+          <option name=3D"block" value=3D"true" />
+          <option name=3D"separateBefore" value=3D"false" />
+          <option name=3D"separateAfter" value=3D"false" />
+          <option name=3D"prefixLines" value=3D"true" />
+          <option name=3D"lenBefore" value=3D"80" />
+          <option name=3D"lenAfter" value=3D"80" />
+          <option name=3D"box" value=3D"false" />
+          <option name=3D"filler" value=3D" " />
+        </value>
+      </option>
+      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
+      <option name=3D"keyword" value=3D"Copyright" />
+      <option name=3D"fileTypeOverride" value=3D"2" />
+      <option name=3D"relativeBefore" value=3D"true" />
+      <option name=3D"addBlankAfter" value=3D"false" />
+      <option name=3D"fileLocation" value=3D"2" />
+      <option name=3D"useAlternate" value=3D"false" />
+    </LanguageOptions>
+  </component>
+  <component name=3D"ideadoc.IdeaDocConfigurationGUI">
+    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForOverridingMethod" e=
nabled=3D"true">
+      <template>/**$s${@inheritDoc}$s$*/</template>
+    </doccer>
+    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForGetter" enabled=3D"=
true">
+      <template>/**$n$$s$*$s$Getter$s$for$s$property$s$'${PROPERTY_NAME}'.=
$n$$s$*$n$$s$*$s$@return$s$Value$s$for$s$property$s$'${PROPERTY_NAME}'.$n$$=
s$*/</template>
+    </doccer>
+    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForSetter" enabled=3D"=
true">
+      <template>/**$n$$s$*$s$Setter$s$for$s$property$s$'${PROPERTY_NAME}'.=
$n$$s$*$n$$s$*$s$@param$s$${PARAM_NAME}$s$Value$s$to$s$set$s$for$s$property=
$s$'${PROPERTY_NAME}'.$n$$s$*/</template>
+    </doccer>
+    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForDefaultConstructor"=
 enabled=3D"true">
+      <template>/**$s$Constructs$s$a$s$new$s$${CLASS_NAME}.$s$*/</template>
+    </doccer>
+    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForPrivateDefaultConst=
ructor" enabled=3D"true">
+      <template>/**$s$Do$s$not$s$instantiate$s$${CLASS_NAME}.$s$*/</templa=
te>
+    </doccer>
+  </component>
+</project>
+

Added: cglib/trunk/hibernate-cglib-repack.iws
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/hibernate-cglib-repack.iws	                        (rev 0)
+++ cglib/trunk/hibernate-cglib-repack.iws	2008-05-21 18:20:50 UTC (rev 146=
77)
@@ -0,0 +1,319 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<project relativePaths=3D"false" version=3D"4">
+  <component name=3D"ChangeListManager">
+    <list default=3D"true" name=3D"Default" comment=3D"" />
+    <ignored path=3D"hibernate-cglib-repack.iws" />
+    <ignored path=3D".idea/workspace.xml" />
+  </component>
+  <component name=3D"ChangesViewManager" flattened_view=3D"true" show_igno=
red=3D"false" />
+  <component name=3D"CreatePatchCommitExecutor">
+    <option name=3D"PATCH_PATH" value=3D"" />
+    <option name=3D"REVERSE_PATCH" value=3D"false" />
+  </component>
+  <component name=3D"DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name=3D"DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
+        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
+        <option name=3D"ENABLED" value=3D"false" />
+        <option name=3D"LOG_ENABLED" value=3D"false" />
+        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
+        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
+        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
+        <option name=3D"COUNT_FILTER" value=3D"0" />
+        <option name=3D"CONDITION_ENABLED" value=3D"false" />
+        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"CONDITION" value=3D"" />
+        <option name=3D"LOG_MESSAGE" value=3D"" />
+      </breakpoint>
+      <breakpoint>
+        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
+        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
+        <option name=3D"ENABLED" value=3D"false" />
+        <option name=3D"LOG_ENABLED" value=3D"false" />
+        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
+        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
+        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
+        <option name=3D"COUNT_FILTER" value=3D"0" />
+        <option name=3D"CONDITION_ENABLED" value=3D"false" />
+        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
+        <option name=3D"CONDITION" value=3D"" />
+        <option name=3D"LOG_MESSAGE" value=3D"" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name=3D"ErrorTreeViewConfiguration">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"HIDE_WARNINGS" value=3D"false" />
+  </component>
+  <component name=3D"FavoritesManager">
+    <favorites_list name=3D"hibernate-cglib-repack" />
+  </component>
+  <component name=3D"FileEditorManager">
+    <leaf>
+      <file leaf-file-name=3D"pom.xml" pinned=3D"false" current=3D"true" c=
urrent-in-tab=3D"true">
+        <entry file=3D"file://$PROJECT_DIR$/pom.xml">
+          <provider selected=3D"true" editor-type-id=3D"text-editor">
+            <state line=3D"109" column=3D"3" selection-start=3D"4533" sele=
ction-end=3D"4533" vertical-scroll-proportion=3D"0.4861111">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name=3D"FindManager">
+    <FindUsagesManager>
+      <setting name=3D"OPEN_NEW_TAB" value=3D"false" />
+    </FindUsagesManager>
+  </component>
+  <component name=3D"HierarchyBrowserManager">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"SORT_ALPHABETICALLY" value=3D"false" />
+    <option name=3D"HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value=3D"fa=
lse" />
+  </component>
+  <component name=3D"ModuleEditorState">
+    <option name=3D"LAST_EDITED_MODULE_NAME" />
+    <option name=3D"LAST_EDITED_TAB_NAME" />
+  </component>
+  <component name=3D"ProjectLevelVcsManager">
+    <OptionsSetting value=3D"true" id=3D"Add" />
+    <OptionsSetting value=3D"true" id=3D"Remove" />
+    <OptionsSetting value=3D"true" id=3D"Checkout" />
+    <OptionsSetting value=3D"true" id=3D"Update" />
+    <OptionsSetting value=3D"true" id=3D"Status" />
+    <OptionsSetting value=3D"true" id=3D"Edit" />
+    <ConfirmationsSetting value=3D"0" id=3D"Add" />
+    <ConfirmationsSetting value=3D"0" id=3D"Remove" />
+  </component>
+  <component name=3D"ProjectPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$/ta=
rget" />
+          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name=3D"ProjectReloadState">
+    <option name=3D"STATE" value=3D"0" />
+  </component>
+  <component name=3D"ProjectView">
+    <navigator currentView=3D"ProjectPane" proportions=3D"0.11111111" vers=
ion=3D"1" splitterProportion=3D"0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <showStructure ProjectPane=3D"false" />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+  </component>
+  <component name=3D"PropertiesComponent">
+    <property name=3D"MemberChooser.copyJavadoc" value=3D"false" />
+    <property name=3D"GoToClass.includeLibraries" value=3D"false" />
+    <property name=3D"MemberChooser.showClasses" value=3D"true" />
+    <property name=3D"MemberChooser.sorted" value=3D"false" />
+    <property name=3D"GoToFile.includeJavaFiles" value=3D"false" />
+    <property name=3D"GoToClass.toSaveIncludeLibraries" value=3D"false" />
+  </component>
+  <component name=3D"RunManager">
+    <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
+      <module name=3D"" />
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"HTML_FILE_NAME" />
+      <option name=3D"HTML_USED" value=3D"false" />
+      <option name=3D"WIDTH" value=3D"400" />
+      <option name=3D"HEIGHT" value=3D"300" />
+      <option name=3D"POLICY_FILE" value=3D"$APPLICATION_HOME_DIR$/bin/app=
letviewer.policy" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration default=3D"true" type=3D"Application" factoryName=3D"Ap=
plication" enabled=3D"false" merge=3D"false">
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"PROGRAM_PARAMETERS" />
+      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+      <option name=3D"ENABLE_SWING_INSPECTOR" value=3D"false" />
+      <option name=3D"ENV_VARIABLES" />
+      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
+      <module name=3D"" />
+    </configuration>
+    <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
+      <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
+      <option name=3D"SERVER_MODE" value=3D"false" />
+      <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
+      <option name=3D"HOST" value=3D"localhost" />
+      <option name=3D"PORT" value=3D"5005" />
+    </configuration>
+    <configuration default=3D"true" type=3D"JUnit" factoryName=3D"JUnit" e=
nabled=3D"false" merge=3D"false">
+      <module name=3D"" />
+      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+      <option name=3D"ALTERNATIVE_JRE_PATH" />
+      <option name=3D"PACKAGE_NAME" />
+      <option name=3D"MAIN_CLASS_NAME" />
+      <option name=3D"METHOD_NAME" />
+      <option name=3D"TEST_OBJECT" value=3D"class" />
+      <option name=3D"VM_PARAMETERS" />
+      <option name=3D"PARAMETERS" />
+      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
+      <option name=3D"ENV_VARIABLES" />
+      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
+      <option name=3D"ADDITIONAL_CLASS_PATH" />
+      <option name=3D"TEST_SEARCH_SCOPE">
+        <value defaultName=3D"wholeProject" />
+      </option>
+    </configuration>
+    <list size=3D"0" />
+    <configuration name=3D"&lt;template&gt;" type=3D"WebApp" default=3D"tr=
ue" selected=3D"false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name=3D"StructureViewFactory">
+    <option name=3D"AUTOSCROLL_MODE" value=3D"true" />
+    <option name=3D"AUTOSCROLL_FROM_SOURCE" value=3D"false" />
+    <option name=3D"ACTIVE_ACTIONS" value=3D"" />
+  </component>
+  <component name=3D"SvnConfiguration">
+    <option name=3D"USER" value=3D"" />
+    <option name=3D"PASSWORD" value=3D"" />
+    <option name=3D"LAST_MERGED_REVISION" />
+    <option name=3D"UPDATE_RUN_STATUS" value=3D"false" />
+    <option name=3D"UPDATE_RECURSIVELY" value=3D"true" />
+    <option name=3D"MERGE_DRY_RUN" value=3D"false" />
+    <configuration useDefault=3D"true">/Users/steve/.subversion</configura=
tion>
+  </component>
+  <component name=3D"TodoView" selected-index=3D"0">
+    <todo-panel id=3D"selected-file">
+      <are-packages-shown value=3D"false" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"true" />
+    </todo-panel>
+    <todo-panel id=3D"all">
+      <are-packages-shown value=3D"true" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"true" />
+    </todo-panel>
+    <todo-panel id=3D"default-changelist">
+      <are-packages-shown value=3D"false" />
+      <are-modules-shown value=3D"false" />
+      <flatten-packages value=3D"false" />
+      <is-autoscroll-to-source value=3D"false" />
+    </todo-panel>
+  </component>
+  <component name=3D"ToolWindowManager">
+    <frame x=3D"0" y=3D"22" width=3D"1680" height=3D"1024" extended-state=
=3D"0" />
+    <editor active=3D"true" />
+    <layout>
+      <window_info id=3D"TODO" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"7" />
+      <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weig=
ht=3D"0.25" order=3D"0" />
+      <window_info id=3D"Find" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"1" />
+      <window_info id=3D"Structure" active=3D"false" anchor=3D"left" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.25" order=3D"1" />
+      <window_info id=3D"Messages" active=3D"false" anchor=3D"bottom" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Inspection" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.4" order=3D"6" />
+      <window_info id=3D"Dependency Viewer" active=3D"false" anchor=3D"bot=
tom" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Module Dependencies" active=3D"false" anchor=3D"r=
ight" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Ant Build" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"1" />
+      <window_info id=3D"Maven projects" active=3D"false" anchor=3D"right"=
 auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"fa=
lse" weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Changes" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.33" order=3D"2" />
+      <window_info id=3D"Hierarchy" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"2" />
+      <window_info id=3D"Debug" active=3D"false" anchor=3D"bottom" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" wei=
ght=3D"0.4" order=3D"4" />
+      <window_info id=3D"Version Control" active=3D"false" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
false" weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Duplicates" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.33" order=3D"-1" />
+      <window_info id=3D"Web" active=3D"false" anchor=3D"left" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"2" />
+      <window_info id=3D"Message" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"0" />
+      <window_info id=3D"EJB" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"3" />
+      <window_info id=3D"Cvs" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"5" />
+      <window_info id=3D"Commander" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.4" order=3D"0" />
+    </layout>
+  </component>
+  <component name=3D"VcsManagerConfiguration">
+    <option name=3D"OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" va=
lue=3D"true" />
+    <option name=3D"CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value=3D"true=
" />
+    <option name=3D"PERFORM_UPDATE_IN_BACKGROUND" value=3D"false" />
+    <option name=3D"PERFORM_COMMIT_IN_BACKGROUND" value=3D"false" />
+    <option name=3D"PERFORM_EDIT_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"PERFORM_ADD_REMOVE_IN_BACKGROUND" value=3D"true" />
+    <option name=3D"FORCE_NON_EMPTY_COMMENT" value=3D"false" />
+    <option name=3D"LAST_COMMIT_MESSAGE" />
+    <option name=3D"OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value=3D"false=
" />
+    <option name=3D"REFORMAT_BEFORE_PROJECT_COMMIT" value=3D"false" />
+    <option name=3D"REFORMAT_BEFORE_FILE_COMMIT" value=3D"false" />
+    <option name=3D"FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" valu=
e=3D"0.8" />
+    <option name=3D"FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value=3D"0.5"=
 />
+    <option name=3D"ACTIVE_VCS_NAME" />
+    <option name=3D"UPDATE_GROUP_BY_PACKAGES" value=3D"false" />
+    <option name=3D"UPDATE_GROUP_BY_CHANGELIST" value=3D"false" />
+    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"false" />
+    <option name=3D"FILE_HISTORY_SPLITTER_PROPORTION" value=3D"0.6" />
+  </component>
+  <component name=3D"antWorkspaceConfiguration">
+    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
+    <option name=3D"FILTER_TARGETS" value=3D"false" />
+  </component>
+  <component name=3D"editorHistoryManager">
+    <entry file=3D"file://$PROJECT_DIR$/pom.xml">
+      <provider selected=3D"true" editor-type-id=3D"text-editor">
+        <state line=3D"109" column=3D"3" selection-start=3D"4533" selectio=
n-end=3D"4533" vertical-scroll-proportion=3D"0.4861111">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
+

Added: cglib/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/pom.xml	                        (rev 0)
+++ cglib/trunk/pom.xml	2008-05-21 18:20:50 UTC (rev 14677)
@@ -0,0 +1,141 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors=
 as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, =
modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Found=
ation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN=
TABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Publi=
c License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public Licen=
se
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  ~
+  -->
+
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate</groupId>
+    <artifactId>hibernate-cglib-repack</artifactId>
+    <version>2.1_3</version>
+    <packaging>jar</packaging>
+
+    <name>Hibernate CGLIB Repackaging</name>
+    <description>
+        A repackaging of CGLIB (and its ASM dependencies) under the org.hi=
bernate namespace to avoid version
+        conflicts.  The produced artifact is not intended for any use othe=
r than to be consumed by hibernate.
+    </description>
+
+    <url>http://hibernate.org</url>
+    <organization>
+        <name>Hibernate.org</name>
+        <url>http://hibernate.org</url>
+    </organization>
+
+    <scm>
+        <connection>scm:svn:https://svn.jboss.org/repos/hibernate/cglib/tr=
unk</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate=
/cglib/trunk</developerConnection>
+        <url>https://svn.jboss.org/repos/hibernate/cglib/trunk</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <version>2.1_3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>cglib:cglib-nodep</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>net.sf.cglib</pattern>
+                                    <shadedPattern>org.hibernate.repackage=
.cglib</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <transformers>
+                                <transformer implementation=3D"org.apache.=
maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- compile to JDK 1.4 compatibility -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+            <!-- add specification/implementation details to the manifests=
 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultSpecificationEntries>true</addDefau=
ltSpecificationEntries>
+                            <addDefaultImplementationEntries>true</addDefa=
ultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Implementation-URL>${pom.url}</Implementation=
-URL>
+                        </manifestEntries>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <repository>
+            <!-- Copy the dist to the local checkout of the JBoss maven2 r=
epo ${maven.repository.root} -->
+            <!-- It is anticipated that ${maven.repository.root} be set in=
 user's settings.xml -->
+            <!-- todo : replace this with direct svn access once the svnki=
t providers are available -->
+            <id>repository.jboss.org</id>
+            <url>file://${maven.repository.root}</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots.jboss.org</id>
+            <name>JBoss Snapshot Repository</name>
+            <url>dav:https://snapshots.jboss.org/maven2</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+</project>
\ No newline at end of file

Added: cglib/trunk/target/dependency-reduced-pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/target/dependency-reduced-pom.xml	                        (=
rev 0)
+++ cglib/trunk/target/dependency-reduced-pom.xml	2008-05-21 18:20:50 UTC (=
rev 14677)
@@ -0,0 +1,87 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<project xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://w=
ww.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=3D"http://maven.apach=
e.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.hibernate</groupId>
+  <artifactId>hibernate-cglib-repack</artifactId>
+  <name>Hibernate CGLIB Repackaging</name>
+  <version>2.1_3</version>
+  <description>A repackaging of CGLIB (and its ASM dependencies) under the=
 org.hibernate namespace to avoid version
+        conflicts.  The produced artifact is not intended for any use othe=
r than to be consumed by hibernate.</description>
+  <url>http://hibernate.org</url>
+  <scm>
+    <connection>scm:svn:https://svn.jboss.org/repos/hibernate/cglib/trunk<=
/connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/cgl=
ib/trunk</developerConnection>
+    <url>https://svn.jboss.org/repos/hibernate/cglib/trunk</url>
+  </scm>
+  <organization>
+    <name>Hibernate.org</name>
+    <url>http://hibernate.org</url>
+  </organization>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>cglib:cglib-nodep</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>net.sf.cglib</pattern>
+                  <shadedPattern>org.hibernate.repackage.cglib</shadedPatt=
ern>
+                </relocation>
+              </relocations>
+              <transformers>
+                <transformer />
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificatio=
nEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementat=
ionEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-URL>${pom.url}</Implementation-URL>
+            </manifestEntries>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <distributionManagement>
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>file://${maven.repository.root}</url>
+    </repository>
+    <snapshotRepository>
+      <id>snapshots.jboss.org</id>
+      <name>JBoss Snapshot Repository</name>
+      <url>dav:https://snapshots.jboss.org/maven2</url>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
+

Added: cglib/trunk/target/hibernate-cglib-repack-2.1_3.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: cglib/trunk/target/hibernate-cglib-repack-2.1_3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: cglib/trunk/target/original-hibernate-cglib-repack-2.1_3.jar
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: cglib/trunk/target/original-hibernate-cglib-repack-2.1=
_3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============2461790096998563935==--

From hibernate-commits at lists.jboss.org Wed May 21 14:22:39 2008
Content-Type: multipart/mixed; boundary="===============0266027409252409068=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14678 - cglib/trunk.
Date: Wed, 21 May 2008 14:22:39 -0400
Message-ID: <E1JysxT-0001ff-3W@committer01.frg.pub.inap.atl.jboss.com>

--===============0266027409252409068==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 14:22:38 -0400 (Wed, 21 May 2008)
New Revision: 14678

Removed:
   cglib/trunk/hibernate-cglib-repack.ipr
   cglib/trunk/hibernate-cglib-repack.iws
   cglib/trunk/target/
Log:
cleaning up import

Deleted: cglib/trunk/hibernate-cglib-repack.ipr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/hibernate-cglib-repack.ipr	2008-05-21 18:20:50 UTC (rev 146=
77)
+++ cglib/trunk/hibernate-cglib-repack.ipr	2008-05-21 18:22:38 UTC (rev 146=
78)
@@ -1,304 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project relativePaths=3D"false" version=3D"4">
-  <component name=3D"AntConfiguration">
-    <defaultAnt bundledAnt=3D"true" />
-  </component>
-  <component name=3D"BuildJarProjectSettings">
-    <option name=3D"BUILD_JARS_ON_MAKE" value=3D"false" />
-  </component>
-  <component name=3D"CodeStyleProjectProfileManger">
-    <option name=3D"PROJECT_PROFILE" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CodeStyleSettingsManager">
-    <option name=3D"PER_PROJECT_SETTINGS" />
-    <option name=3D"USE_PER_PROJECT_SETTINGS" value=3D"false" />
-  </component>
-  <component name=3D"CompilerConfiguration">
-    <option name=3D"DEFAULT_COMPILER" value=3D"Javac" />
-    <option name=3D"DEPLOY_AFTER_MAKE" value=3D"0" />
-    <resourceExtensions>
-      <entry name=3D".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=3D".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-    <wildcardResourcePatterns>
-      <entry name=3D"?*.properties" />
-      <entry name=3D"?*.xml" />
-      <entry name=3D"?*.gif" />
-      <entry name=3D"?*.png" />
-      <entry name=3D"?*.jpeg" />
-      <entry name=3D"?*.jpg" />
-      <entry name=3D"?*.html" />
-      <entry name=3D"?*.dtd" />
-      <entry name=3D"?*.tld" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name=3D"DependenciesAnalyzeManager">
-    <option name=3D"myForwardDirection" value=3D"false" />
-  </component>
-  <component name=3D"DependencyValidationManager">
-    <option name=3D"SKIP_IMPORT_STATEMENTS" value=3D"false" />
-  </component>
-  <component name=3D"EclipseCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EclipseEmbeddedCompilerSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"EntryPointsManager">
-    <entry_points version=3D"2.0" />
-  </component>
-  <component name=3D"InspectionProjectProfileManager">
-    <option name=3D"PROJECT_PROFILE" value=3D"Project Default" />
-    <option name=3D"USE_PROJECT_LEVEL_SETTINGS" value=3D"false" />
-    <scopes />
-    <profiles>
-      <profile version=3D"1.0" is_locked=3D"false">
-        <option name=3D"myName" value=3D"Project Default" />
-        <option name=3D"myLocal" value=3D"false" />
-      </profile>
-    </profiles>
-    <list size=3D"0" />
-  </component>
-  <component name=3D"JavacSettings">
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-    <option name=3D"MAXIMUM_HEAP_SIZE" value=3D"128" />
-  </component>
-  <component name=3D"JavadocGenerationManager">
-    <option name=3D"OUTPUT_DIRECTORY" />
-    <option name=3D"OPTION_SCOPE" value=3D"protected" />
-    <option name=3D"OPTION_HIERARCHY" value=3D"true" />
-    <option name=3D"OPTION_NAVIGATOR" value=3D"true" />
-    <option name=3D"OPTION_INDEX" value=3D"true" />
-    <option name=3D"OPTION_SEPARATE_INDEX" value=3D"true" />
-    <option name=3D"OPTION_DOCUMENT_TAG_USE" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_AUTHOR" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_VERSION" value=3D"false" />
-    <option name=3D"OPTION_DOCUMENT_TAG_DEPRECATED" value=3D"true" />
-    <option name=3D"OPTION_DEPRECATED_LIST" value=3D"true" />
-    <option name=3D"OTHER_OPTIONS" value=3D"" />
-    <option name=3D"HEAP_SIZE" />
-    <option name=3D"LOCALE" />
-    <option name=3D"OPEN_IN_BROWSER" value=3D"true" />
-  </component>
-  <component name=3D"JikesSettings">
-    <option name=3D"JIKES_PATH" value=3D"" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"DEPRECATION" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"IS_EMACS_ERRORS_MODE" value=3D"true" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"MavenImporterState">
-    <option name=3D"autoImport">
-      <set>
-        <option value=3D"$PROJECT_DIR$/pom.xml" />
-      </set>
-    </option>
-  </component>
-  <component name=3D"ProjectFileVersion" converted=3D"true" />
-  <component name=3D"ProjectModuleManager">
-    <modules />
-  </component>
-  <component name=3D"ProjectRootManager" version=3D"2" assert-keyword=3D"t=
rue" jdk-15=3D"true" project-jdk-name=3D"1.5" project-jdk-type=3D"JavaSDK">
-    <output url=3D"file://$PROJECT_DIR$/out" />
-  </component>
-  <component name=3D"ResourceManagerContainer">
-    <option name=3D"myResourceBundles">
-      <value>
-        <list size=3D"0" />
-      </value>
-    </option>
-  </component>
-  <component name=3D"RmicSettings">
-    <option name=3D"IS_EANABLED" value=3D"false" />
-    <option name=3D"DEBUGGING_INFO" value=3D"true" />
-    <option name=3D"GENERATE_NO_WARNINGS" value=3D"false" />
-    <option name=3D"GENERATE_IIOP_STUBS" value=3D"false" />
-    <option name=3D"ADDITIONAL_OPTIONS_STRING" value=3D"" />
-  </component>
-  <component name=3D"VcsDirectoryMappings">
-    <mapping directory=3D"" vcs=3D"" />
-  </component>
-  <component name=3D"copyright">
-    <Base>
-      <setting name=3D"state" value=3D"1" />
-    </Base>
-    <LanguageOptions name=3D"$TEMPLATE$">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Hibernate, Relational Persistence f=
or Idiomatic Java&#10;&#10;Copyright (c) &amp;#36;today.year, Red Hat Middl=
eware LLC or third-party contributors as &#10;indicated by the @author tags=
 or express copyright attribution &#10;statements applied by the authors.  =
All third-party contributions are &#10;distributed under license by Red Hat=
 Middleware LLC.&#10;&#10;This copyrighted material is made available to an=
yone wishing to use, modify,&#10;copy, or redistribute it subject to the te=
rms and conditions of the GNU&#10;Lesser General Public License, as publish=
ed by the Free Software Foundation.&#10;&#10;This program is distributed in=
 the hope that it will be useful, &#10;but WITHOUT ANY WARRANTY; without ev=
en the implied warranty of MERCHANTABILITY &#10;or FITNESS FOR A PARTICULAR=
 PURPOSE.  See the GNU Lesser General Public License&#10;for more details.&=
#10;&#10;You should have received a copy of the GNU Lesser General Public L=
icense&#10;along w!
 ith this distribution; if not, write to:&#10;Free Software Foundation, Inc=
.&#10;51 Franklin Street, Fifth Floor&#10;Boston, MA  02110-1301  USA&#10;"=
 />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"4" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"1" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"HTML">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"2" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"JAVA">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"1" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"JSP">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"2" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"JavaScript">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"1" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"Properties">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"1" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-    <LanguageOptions name=3D"XML">
-      <option name=3D"templateOptions">
-        <value>
-          <option name=3D"block" value=3D"true" />
-          <option name=3D"separateBefore" value=3D"false" />
-          <option name=3D"separateAfter" value=3D"false" />
-          <option name=3D"prefixLines" value=3D"true" />
-          <option name=3D"lenBefore" value=3D"80" />
-          <option name=3D"lenAfter" value=3D"80" />
-          <option name=3D"box" value=3D"false" />
-          <option name=3D"filler" value=3D" " />
-        </value>
-      </option>
-      <option name=3D"notice" value=3D"Copyright (c) &amp;#36;today.year, =
Your Corporation. All Rights Reserved." />
-      <option name=3D"keyword" value=3D"Copyright" />
-      <option name=3D"fileTypeOverride" value=3D"2" />
-      <option name=3D"relativeBefore" value=3D"true" />
-      <option name=3D"addBlankAfter" value=3D"false" />
-      <option name=3D"fileLocation" value=3D"2" />
-      <option name=3D"useAlternate" value=3D"false" />
-    </LanguageOptions>
-  </component>
-  <component name=3D"ideadoc.IdeaDocConfigurationGUI">
-    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForOverridingMethod" e=
nabled=3D"true">
-      <template>/**$s${@inheritDoc}$s$*/</template>
-    </doccer>
-    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForGetter" enabled=3D"=
true">
-      <template>/**$n$$s$*$s$Getter$s$for$s$property$s$'${PROPERTY_NAME}'.=
$n$$s$*$n$$s$*$s$@return$s$Value$s$for$s$property$s$'${PROPERTY_NAME}'.$n$$=
s$*/</template>
-    </doccer>
-    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForSetter" enabled=3D"=
true">
-      <template>/**$n$$s$*$s$Setter$s$for$s$property$s$'${PROPERTY_NAME}'.=
$n$$s$*$n$$s$*$s$@param$s$${PARAM_NAME}$s$Value$s$to$s$set$s$for$s$property=
$s$'${PROPERTY_NAME}'.$n$$s$*/</template>
-    </doccer>
-    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForDefaultConstructor"=
 enabled=3D"true">
-      <template>/**$s$Constructs$s$a$s$new$s$${CLASS_NAME}.$s$*/</template>
-    </doccer>
-    <doccer class=3D"nl.piraya.ideadoc.doccer.DoccerForPrivateDefaultConst=
ructor" enabled=3D"true">
-      <template>/**$s$Do$s$not$s$instantiate$s$${CLASS_NAME}.$s$*/</templa=
te>
-    </doccer>
-  </component>
-</project>
-

Deleted: cglib/trunk/hibernate-cglib-repack.iws
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- cglib/trunk/hibernate-cglib-repack.iws	2008-05-21 18:20:50 UTC (rev 146=
77)
+++ cglib/trunk/hibernate-cglib-repack.iws	2008-05-21 18:22:38 UTC (rev 146=
78)
@@ -1,319 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<project relativePaths=3D"false" version=3D"4">
-  <component name=3D"ChangeListManager">
-    <list default=3D"true" name=3D"Default" comment=3D"" />
-    <ignored path=3D"hibernate-cglib-repack.iws" />
-    <ignored path=3D".idea/workspace.xml" />
-  </component>
-  <component name=3D"ChangesViewManager" flattened_view=3D"true" show_igno=
red=3D"false" />
-  <component name=3D"CreatePatchCommitExecutor">
-    <option name=3D"PATCH_PATH" value=3D"" />
-    <option name=3D"REVERSE_PATCH" value=3D"false" />
-  </component>
-  <component name=3D"DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name=3D"DebuggerManager">
-    <breakpoint_any>
-      <breakpoint>
-        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
-        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
-        <option name=3D"ENABLED" value=3D"false" />
-        <option name=3D"LOG_ENABLED" value=3D"false" />
-        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
-        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
-        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
-        <option name=3D"COUNT_FILTER" value=3D"0" />
-        <option name=3D"CONDITION_ENABLED" value=3D"false" />
-        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"CONDITION" value=3D"" />
-        <option name=3D"LOG_MESSAGE" value=3D"" />
-      </breakpoint>
-      <breakpoint>
-        <option name=3D"NOTIFY_CAUGHT" value=3D"true" />
-        <option name=3D"NOTIFY_UNCAUGHT" value=3D"true" />
-        <option name=3D"ENABLED" value=3D"false" />
-        <option name=3D"LOG_ENABLED" value=3D"false" />
-        <option name=3D"LOG_EXPRESSION_ENABLED" value=3D"false" />
-        <option name=3D"SUSPEND_POLICY" value=3D"SuspendAll" />
-        <option name=3D"COUNT_FILTER_ENABLED" value=3D"false" />
-        <option name=3D"COUNT_FILTER" value=3D"0" />
-        <option name=3D"CONDITION_ENABLED" value=3D"false" />
-        <option name=3D"CLASS_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"INSTANCE_FILTERS_ENABLED" value=3D"false" />
-        <option name=3D"CONDITION" value=3D"" />
-        <option name=3D"LOG_MESSAGE" value=3D"" />
-      </breakpoint>
-    </breakpoint_any>
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
-  <component name=3D"ErrorTreeViewConfiguration">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"HIDE_WARNINGS" value=3D"false" />
-  </component>
-  <component name=3D"FavoritesManager">
-    <favorites_list name=3D"hibernate-cglib-repack" />
-  </component>
-  <component name=3D"FileEditorManager">
-    <leaf>
-      <file leaf-file-name=3D"pom.xml" pinned=3D"false" current=3D"true" c=
urrent-in-tab=3D"true">
-        <entry file=3D"file://$PROJECT_DIR$/pom.xml">
-          <provider selected=3D"true" editor-type-id=3D"text-editor">
-            <state line=3D"109" column=3D"3" selection-start=3D"4533" sele=
ction-end=3D"4533" vertical-scroll-proportion=3D"0.4861111">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name=3D"FindManager">
-    <FindUsagesManager>
-      <setting name=3D"OPEN_NEW_TAB" value=3D"false" />
-    </FindUsagesManager>
-  </component>
-  <component name=3D"HierarchyBrowserManager">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"SORT_ALPHABETICALLY" value=3D"false" />
-    <option name=3D"HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value=3D"fa=
lse" />
-  </component>
-  <component name=3D"ModuleEditorState">
-    <option name=3D"LAST_EDITED_MODULE_NAME" />
-    <option name=3D"LAST_EDITED_TAB_NAME" />
-  </component>
-  <component name=3D"ProjectLevelVcsManager">
-    <OptionsSetting value=3D"true" id=3D"Add" />
-    <OptionsSetting value=3D"true" id=3D"Remove" />
-    <OptionsSetting value=3D"true" id=3D"Checkout" />
-    <OptionsSetting value=3D"true" id=3D"Update" />
-    <OptionsSetting value=3D"true" id=3D"Status" />
-    <OptionsSetting value=3D"true" id=3D"Edit" />
-    <ConfirmationsSetting value=3D"0" id=3D"Add" />
-    <ConfirmationsSetting value=3D"0" id=3D"Remove" />
-  </component>
-  <component name=3D"ProjectPane">
-    <subPane>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"hibernate-cglib-repack" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name=3D"myItemId" value=3D"PsiDirectory:$PROJECT_DIR$/ta=
rget" />
-          <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </subPane>
-  </component>
-  <component name=3D"ProjectReloadState">
-    <option name=3D"STATE" value=3D"0" />
-  </component>
-  <component name=3D"ProjectView">
-    <navigator currentView=3D"ProjectPane" proportions=3D"0.11111111" vers=
ion=3D"1" splitterProportion=3D"0.5">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <showStructure ProjectPane=3D"false" />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-    </navigator>
-  </component>
-  <component name=3D"PropertiesComponent">
-    <property name=3D"MemberChooser.copyJavadoc" value=3D"false" />
-    <property name=3D"GoToClass.includeLibraries" value=3D"false" />
-    <property name=3D"MemberChooser.showClasses" value=3D"true" />
-    <property name=3D"MemberChooser.sorted" value=3D"false" />
-    <property name=3D"GoToFile.includeJavaFiles" value=3D"false" />
-    <property name=3D"GoToClass.toSaveIncludeLibraries" value=3D"false" />
-  </component>
-  <component name=3D"RunManager">
-    <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
-      <module name=3D"" />
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"HTML_FILE_NAME" />
-      <option name=3D"HTML_USED" value=3D"false" />
-      <option name=3D"WIDTH" value=3D"400" />
-      <option name=3D"HEIGHT" value=3D"300" />
-      <option name=3D"POLICY_FILE" value=3D"$APPLICATION_HOME_DIR$/bin/app=
letviewer.policy" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-    </configuration>
-    <configuration default=3D"true" type=3D"Application" factoryName=3D"Ap=
plication" enabled=3D"false" merge=3D"false">
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"PROGRAM_PARAMETERS" />
-      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-      <option name=3D"ENABLE_SWING_INSPECTOR" value=3D"false" />
-      <option name=3D"ENV_VARIABLES" />
-      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
-      <module name=3D"" />
-    </configuration>
-    <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
-      <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
-      <option name=3D"SERVER_MODE" value=3D"false" />
-      <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
-      <option name=3D"HOST" value=3D"localhost" />
-      <option name=3D"PORT" value=3D"5005" />
-    </configuration>
-    <configuration default=3D"true" type=3D"JUnit" factoryName=3D"JUnit" e=
nabled=3D"false" merge=3D"false">
-      <module name=3D"" />
-      <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
-      <option name=3D"ALTERNATIVE_JRE_PATH" />
-      <option name=3D"PACKAGE_NAME" />
-      <option name=3D"MAIN_CLASS_NAME" />
-      <option name=3D"METHOD_NAME" />
-      <option name=3D"TEST_OBJECT" value=3D"class" />
-      <option name=3D"VM_PARAMETERS" />
-      <option name=3D"PARAMETERS" />
-      <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
-      <option name=3D"ENV_VARIABLES" />
-      <option name=3D"PASS_PARENT_ENVS" value=3D"true" />
-      <option name=3D"ADDITIONAL_CLASS_PATH" />
-      <option name=3D"TEST_SEARCH_SCOPE">
-        <value defaultName=3D"wholeProject" />
-      </option>
-    </configuration>
-    <list size=3D"0" />
-    <configuration name=3D"&lt;template&gt;" type=3D"WebApp" default=3D"tr=
ue" selected=3D"false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
-  <component name=3D"StructureViewFactory">
-    <option name=3D"AUTOSCROLL_MODE" value=3D"true" />
-    <option name=3D"AUTOSCROLL_FROM_SOURCE" value=3D"false" />
-    <option name=3D"ACTIVE_ACTIONS" value=3D"" />
-  </component>
-  <component name=3D"SvnConfiguration">
-    <option name=3D"USER" value=3D"" />
-    <option name=3D"PASSWORD" value=3D"" />
-    <option name=3D"LAST_MERGED_REVISION" />
-    <option name=3D"UPDATE_RUN_STATUS" value=3D"false" />
-    <option name=3D"UPDATE_RECURSIVELY" value=3D"true" />
-    <option name=3D"MERGE_DRY_RUN" value=3D"false" />
-    <configuration useDefault=3D"true">/Users/steve/.subversion</configura=
tion>
-  </component>
-  <component name=3D"TodoView" selected-index=3D"0">
-    <todo-panel id=3D"selected-file">
-      <are-packages-shown value=3D"false" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"true" />
-    </todo-panel>
-    <todo-panel id=3D"all">
-      <are-packages-shown value=3D"true" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"true" />
-    </todo-panel>
-    <todo-panel id=3D"default-changelist">
-      <are-packages-shown value=3D"false" />
-      <are-modules-shown value=3D"false" />
-      <flatten-packages value=3D"false" />
-      <is-autoscroll-to-source value=3D"false" />
-    </todo-panel>
-  </component>
-  <component name=3D"ToolWindowManager">
-    <frame x=3D"0" y=3D"22" width=3D"1680" height=3D"1024" extended-state=
=3D"0" />
-    <editor active=3D"true" />
-    <layout>
-      <window_info id=3D"TODO" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"7" />
-      <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weig=
ht=3D"0.25" order=3D"0" />
-      <window_info id=3D"Find" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"1" />
-      <window_info id=3D"Structure" active=3D"false" anchor=3D"left" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.25" order=3D"1" />
-      <window_info id=3D"Messages" active=3D"false" anchor=3D"bottom" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Inspection" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.4" order=3D"6" />
-      <window_info id=3D"Dependency Viewer" active=3D"false" anchor=3D"bot=
tom" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Module Dependencies" active=3D"false" anchor=3D"r=
ight" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Ant Build" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"1" />
-      <window_info id=3D"Maven projects" active=3D"false" anchor=3D"right"=
 auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"fa=
lse" weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Changes" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.33" order=3D"2" />
-      <window_info id=3D"Hierarchy" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"2" />
-      <window_info id=3D"Debug" active=3D"false" anchor=3D"bottom" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" wei=
ght=3D"0.4" order=3D"4" />
-      <window_info id=3D"Version Control" active=3D"false" anchor=3D"botto=
m" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"=
false" weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Duplicates" active=3D"false" anchor=3D"bottom" au=
to_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false=
" weight=3D"0.33" order=3D"-1" />
-      <window_info id=3D"Web" active=3D"false" anchor=3D"left" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"2" />
-      <window_info id=3D"Message" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"0" />
-      <window_info id=3D"EJB" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"3" />
-      <window_info id=3D"Cvs" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.25" order=3D"5" />
-      <window_info id=3D"Commander" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.4" order=3D"0" />
-    </layout>
-  </component>
-  <component name=3D"VcsManagerConfiguration">
-    <option name=3D"OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" va=
lue=3D"true" />
-    <option name=3D"CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value=3D"true=
" />
-    <option name=3D"PERFORM_UPDATE_IN_BACKGROUND" value=3D"false" />
-    <option name=3D"PERFORM_COMMIT_IN_BACKGROUND" value=3D"false" />
-    <option name=3D"PERFORM_EDIT_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"PERFORM_ADD_REMOVE_IN_BACKGROUND" value=3D"true" />
-    <option name=3D"FORCE_NON_EMPTY_COMMENT" value=3D"false" />
-    <option name=3D"LAST_COMMIT_MESSAGE" />
-    <option name=3D"OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value=3D"false=
" />
-    <option name=3D"REFORMAT_BEFORE_PROJECT_COMMIT" value=3D"false" />
-    <option name=3D"REFORMAT_BEFORE_FILE_COMMIT" value=3D"false" />
-    <option name=3D"FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" valu=
e=3D"0.8" />
-    <option name=3D"FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value=3D"0.5"=
 />
-    <option name=3D"ACTIVE_VCS_NAME" />
-    <option name=3D"UPDATE_GROUP_BY_PACKAGES" value=3D"false" />
-    <option name=3D"UPDATE_GROUP_BY_CHANGELIST" value=3D"false" />
-    <option name=3D"SHOW_FILE_HISTORY_AS_TREE" value=3D"false" />
-    <option name=3D"FILE_HISTORY_SPLITTER_PROPORTION" value=3D"0.6" />
-  </component>
-  <component name=3D"antWorkspaceConfiguration">
-    <option name=3D"IS_AUTOSCROLL_TO_SOURCE" value=3D"false" />
-    <option name=3D"FILTER_TARGETS" value=3D"false" />
-  </component>
-  <component name=3D"editorHistoryManager">
-    <entry file=3D"file://$PROJECT_DIR$/pom.xml">
-      <provider selected=3D"true" editor-type-id=3D"text-editor">
-        <state line=3D"109" column=3D"3" selection-start=3D"4533" selectio=
n-end=3D"4533" vertical-scroll-proportion=3D"0.4861111">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
-


--===============0266027409252409068==--

From hibernate-commits at lists.jboss.org Wed May 21 14:32:13 2008
Content-Type: multipart/mixed; boundary="===============6121735278088608249=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14679 - cglib/trunk.
Date: Wed, 21 May 2008 14:32:13 -0400
Message-ID: <E1Jyt6j-0003vc-AE@committer01.frg.pub.inap.atl.jboss.com>

--===============6121735278088608249==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 14:32:13 -0400 (Wed, 21 May 2008)
New Revision: 14679

Modified:
   cglib/trunk/
Log:
added svn:ignore


Property changes on: cglib/trunk
___________________________________________________________________
Name: svn:ignore
   + target
local
*.ipr
*.iws
*.iml
.classpath
.project
.nbattrs
*.log
*.properties
.clover



--===============6121735278088608249==--

From hibernate-commits at lists.jboss.org Wed May 21 14:44:28 2008
Content-Type: multipart/mixed; boundary="===============3227875758807478951=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14680 - cglib/tags.
Date: Wed, 21 May 2008 14:44:27 -0400
Message-ID: <E1JytIZ-0006GK-Rd@committer01.frg.pub.inap.atl.jboss.com>

--===============3227875758807478951==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 14:44:27 -0400 (Wed, 21 May 2008)
New Revision: 14680

Added:
   cglib/tags/hibernate-cglib-repack-2.1_3/
Log:
[maven-scm] copy for tag hibernate-cglib-repack-2.1_3

Copied: cglib/tags/hibernate-cglib-repack-2.1_3 (from rev 14679, cglib/trun=
k)


--===============3227875758807478951==--

From hibernate-commits at lists.jboss.org Wed May 21 15:53:22 2008
Content-Type: multipart/mixed; boundary="===============2228074240182239653=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14681 - core/trunk/parent.
Date: Wed, 21 May 2008 15:53:21 -0400
Message-ID: <E1JyuNF-0005RY-MU@committer01.frg.pub.inap.atl.jboss.com>

--===============2228074240182239653==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 15:53:21 -0400 (Wed, 21 May 2008)
New Revision: 14681

Modified:
   core/trunk/parent/pom.xml
Log:
made recomended changes wrt defining plugin versions in pluginManagement

Modified: core/trunk/parent/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/parent/pom.xml	2008-05-21 18:44:27 UTC (rev 14680)
+++ core/trunk/parent/pom.xml	2008-05-21 19:53:21 UTC (rev 14681)
@@ -117,7 +117,6 @@
                 <!-- 2.0.8 not released at this time, so I instead say any=
thing greater that 2.0.7 -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0-alpha-3</version>
                 <executions>
                     <execution>
                         <id>enforce-java</id>
@@ -141,7 +140,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
                 <configuration>
                     <source>1.4</source>
                     <target>1.4</target>
@@ -151,7 +149,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.1</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -164,6 +161,13 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFi=
le>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -172,6 +176,26 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.4</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.4.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0-alpha-3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.0.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <extensions>
@@ -187,16 +211,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFi=
le>
-                </configuration>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.4.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.4</version>
                 <configuration>
                     <links>
                         <link>http://java.sun.com/j2se/1.4.2/docs/api/</li=
nk>


--===============2228074240182239653==--

From hibernate-commits at lists.jboss.org Wed May 21 16:13:21 2008
Content-Type: multipart/mixed; boundary="===============7398981452561432792=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14682 - in core/trunk:
 core/src/main/java/org/hibernate/bytecode/cglib and 7 other directories.
Date: Wed, 21 May 2008 16:13:20 -0400
Message-ID: <E1Jyuga-0001iJ-Sw@committer01.frg.pub.inap.atl.jboss.com>

--===============7398981452561432792==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-21 16:13:20 -0400 (Wed, 21 May 2008)
New Revision: 14682

Modified:
   core/trunk/core/pom.xml
   core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimiz=
erAdapter.java
   core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProvi=
derImpl.java
   core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTra=
nsformer.java
   core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Instantiation=
OptimizerAdapter.java
   core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryF=
actoryImpl.java
   core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java
   core/trunk/core/src/main/java/org/hibernate/intercept/FieldInterceptionH=
elper.java
   core/trunk/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.=
java
   core/trunk/core/src/main/java/org/hibernate/intercept/cglib/FieldInterce=
ptorImpl.java
   core/trunk/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyIn=
itializer.java
   core/trunk/core/src/main/java/org/hibernate/tool/instrument/cglib/Instru=
mentTask.java
   core/trunk/testsuite/pom.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGL=
IBThreadLocalTest.java
Log:
HHH-2875 : cglib+asm repackage;
HHH-2506 : make javassist the default bytecode provider

Modified: core/trunk/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/pom.xml	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/pom.xml	2008-05-21 20:13:20 UTC (rev 14682)
@@ -63,17 +63,11 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-cglib-repack</artifactId>
             <version>2.1_3</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-attrs</artifactId>
-            <version>1.5.3</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 =

     <build>

Modified: core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Access=
OptimizerAdapter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimi=
zerAdapter.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimi=
zerAdapter.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -2,9 +2,8 @@
 =

 import org.hibernate.bytecode.ReflectionOptimizer;
 import org.hibernate.PropertyAccessException;
-import net.sf.cglib.beans.BulkBean;
-import net.sf.cglib.beans.BulkBeanException;
-import net.sf.cglib.reflect.FastClass;
+import org.hibernate.repackage.cglib.beans.BulkBean;
+import org.hibernate.repackage.cglib.beans.BulkBeanException;
 =

 import java.io.Serializable;
 import java.io.ObjectOutputStream;

Modified: core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Byteco=
deProviderImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProv=
iderImpl.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProv=
iderImpl.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -2,15 +2,9 @@
 =

 import java.lang.reflect.Modifier;
 =

-import net.sf.cglib.beans.BulkBean;
-import net.sf.cglib.beans.BulkBeanException;
-import net.sf.cglib.reflect.FastClass;
-import net.sf.cglib.transform.ClassFilter;
-import net.sf.cglib.transform.ClassTransformer;
-import net.sf.cglib.transform.ClassTransformerFactory;
-import net.sf.cglib.transform.TransformingClassLoader;
-import net.sf.cglib.transform.impl.InterceptFieldFilter;
-import net.sf.cglib.transform.impl.InterceptFieldTransformer;
+import org.hibernate.repackage.cglib.beans.BulkBean;
+import org.hibernate.repackage.cglib.beans.BulkBeanException;
+import org.hibernate.repackage.cglib.reflect.FastClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.hibernate.bytecode.BytecodeProvider;
@@ -18,7 +12,6 @@
 import org.hibernate.bytecode.ReflectionOptimizer;
 import org.hibernate.bytecode.util.FieldFilter;
 import org.hibernate.util.StringHelper;
-import org.objectweb.asm.Type;
 =

 /**
  * Bytecode provider implementation for CGLIB.
@@ -29,6 +22,10 @@
 =

 	private static final Logger log =3D LoggerFactory.getLogger( BytecodeProv=
iderImpl.class );
 =

+	public BytecodeProviderImpl() {
+		log.warn( "The CGLIB BytecodeProvider impl is considered deprecated and =
not recommended for use" );
+	}
+
 	public ProxyFactoryFactory getProxyFactoryFactory() {
 		return new ProxyFactoryFactoryImpl();
 	}

Modified: core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/CglibC=
lassTransformer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTr=
ansformer.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTr=
ansformer.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -6,25 +6,25 @@
 import java.io.IOException;
 import java.io.ByteArrayOutputStream;
 =

-import net.sf.cglib.transform.ClassTransformer;
-import net.sf.cglib.transform.TransformingClassGenerator;
-import net.sf.cglib.transform.ClassReaderGenerator;
-import net.sf.cglib.transform.impl.InterceptFieldEnabled;
-import net.sf.cglib.transform.impl.InterceptFieldFilter;
-import net.sf.cglib.transform.impl.InterceptFieldTransformer;
-import net.sf.cglib.core.ClassNameReader;
-import net.sf.cglib.core.DebuggingClassWriter;
+import org.hibernate.repackage.cglib.transform.ClassTransformer;
+import org.hibernate.repackage.cglib.transform.TransformingClassGenerator;
+import org.hibernate.repackage.cglib.transform.ClassReaderGenerator;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldFilter;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldTransfor=
mer;
+import org.hibernate.repackage.cglib.core.ClassNameReader;
+import org.hibernate.repackage.cglib.core.DebuggingClassWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.hibernate.bytecode.AbstractClassTransformerImpl;
 import org.hibernate.bytecode.util.FieldFilter;
 import org.hibernate.bytecode.util.ClassFilter;
 import org.hibernate.HibernateException;
-import org.objectweb.asm.Attribute;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.attrs.Attributes;
+import org.hibernate.repackage.cglib.asm.Attribute;
+import org.hibernate.repackage.cglib.asm.Type;
+import org.hibernate.repackage.cglib.asm.ClassReader;
+import org.hibernate.repackage.cglib.asm.ClassWriter;
+import org.hibernate.repackage.cglib.asm.attrs.Attributes;
 =

 /**
  * Enhance the classes allowing them to implements InterceptFieldEnabled

Modified: core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Instan=
tiationOptimizerAdapter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Instantiatio=
nOptimizerAdapter.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/Instantiatio=
nOptimizerAdapter.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -1,7 +1,7 @@
 package org.hibernate.bytecode.cglib;
 =

 import org.hibernate.bytecode.ReflectionOptimizer;
-import net.sf.cglib.reflect.FastClass;
+import org.hibernate.repackage.cglib.reflect.FastClass;
 import org.hibernate.InstantiationException;
 =

 import java.io.Serializable;

Modified: core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/ProxyF=
actoryFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactory=
FactoryImpl.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactory=
FactoryImpl.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -6,13 +6,13 @@
 import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-import net.sf.cglib.proxy.NoOp;
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Factory;
+import org.hibernate.repackage.cglib.proxy.Enhancer;
+import org.hibernate.repackage.cglib.proxy.CallbackFilter;
+import org.hibernate.repackage.cglib.proxy.MethodInterceptor;
+import org.hibernate.repackage.cglib.proxy.MethodProxy;
+import org.hibernate.repackage.cglib.proxy.NoOp;
+import org.hibernate.repackage.cglib.proxy.Callback;
+import org.hibernate.repackage.cglib.proxy.Factory;
 =

 import java.lang.reflect.Method;
 import java.util.HashMap;

Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java	2008-0=
5-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java	2008-0=
5-21 20:13:20 UTC (rev 14682)
@@ -681,9 +681,8 @@
 		return (String) ISOLATION_LEVELS.get( new Integer(isolation) );
 	}
 =

-
 	public static BytecodeProvider buildBytecodeProvider(Properties propertie=
s) {
-		String provider =3D PropertiesHelper.getString( Environment.BYTECODE_PRO=
VIDER, properties, "cglib" );
+		String provider =3D PropertiesHelper.getString( BYTECODE_PROVIDER, prope=
rties, "javassist" );
 		log.info( "Bytecode provider name : " + provider );
 		return buildBytecodeProvider( provider );
 	}
@@ -695,10 +694,9 @@
 		else if ( "cglib".equals( providerName ) ) {
 			return new org.hibernate.bytecode.cglib.BytecodeProviderImpl();
 		}
-		else {
-			log.warn( "unrecognized bytecode provider [" + providerName + "], using=
 cglib by default" );
-			return new org.hibernate.bytecode.cglib.BytecodeProviderImpl();
-		}
+
+		log.warn( "unrecognized bytecode provider [" + providerName + "], using =
javassist by default" );
+		return new org.hibernate.bytecode.javassist.BytecodeProviderImpl();
 	}
 =

 }

Modified: core/trunk/core/src/main/java/org/hibernate/intercept/FieldInterc=
eptionHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/intercept/FieldInterception=
Helper.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/intercept/FieldInterception=
Helper.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -26,7 +26,7 @@
 	public static boolean isInstrumented(Class entityClass) {
 		Class[] definedInterfaces =3D entityClass.getInterfaces();
 		for ( int i =3D 0; i < definedInterfaces.length; i++ ) {
-			if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( define=
dInterfaces[i].getName() )
+			if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnable=
d".equals( definedInterfaces[i].getName() )
 			     || "org.hibernate.bytecode.javassist.FieldHandled".equals( defined=
Interfaces[i].getName() ) ) {
 				return true;
 			}
@@ -44,7 +44,7 @@
 		}
 		Class[] definedInterfaces =3D entity.getClass().getInterfaces();
 		for ( int i =3D 0; i < definedInterfaces.length; i++ ) {
-			if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( define=
dInterfaces[i].getName() ) ) {
+			if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnable=
d".equals( definedInterfaces[i].getName() ) ) {
 				// we have a CGLIB enhanced entity
 				return CGLIBHelper.extractFieldInterceptor( entity );
 			}
@@ -64,7 +64,7 @@
 		if ( entity !=3D null ) {
 			Class[] definedInterfaces =3D entity.getClass().getInterfaces();
 			for ( int i =3D 0; i < definedInterfaces.length; i++ ) {
-				if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( defin=
edInterfaces[i].getName() ) ) {
+				if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabl=
ed".equals( definedInterfaces[i].getName() ) ) {
 					// we have a CGLIB enhanced entity
 					return CGLIBHelper.injectFieldInterceptor( entity, entityName, uninit=
ializedFieldNames, session );
 				}

Modified: core/trunk/core/src/main/java/org/hibernate/intercept/cglib/CGLIB=
Helper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper=
.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper=
.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -2,7 +2,7 @@
 =

 import org.hibernate.intercept.FieldInterceptor;
 import org.hibernate.engine.SessionImplementor;
-import net.sf.cglib.transform.impl.InterceptFieldEnabled;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled;
 =

 import java.util.Set;
 =


Modified: core/trunk/core/src/main/java/org/hibernate/intercept/cglib/Field=
InterceptorImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/intercept/cglib/FieldInterc=
eptorImpl.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/intercept/cglib/FieldInterc=
eptorImpl.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -4,7 +4,7 @@
 import java.io.Serializable;
 import java.util.Set;
 =

-import net.sf.cglib.transform.impl.InterceptFieldCallback;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldCallback;
 =

 import org.hibernate.intercept.AbstractFieldInterceptor;
 import org.hibernate.engine.SessionImplementor;
@@ -25,9 +25,9 @@
 	/**
 	 * Package-protected constructor
 	 *
-	 * @param session
-	 * @param uninitializedFields
-	 * @param entityName
+	 * @param session The Hibernate session
+	 * @param uninitializedFields Names of the fields we need to initialize o=
n load
+	 * @param entityName The entity name to which we are being bound
 	 */
 	FieldInterceptorImpl(SessionImplementor session, Set uninitializedFields,=
 String entityName) {
 		super( session, uninitializedFields, entityName );

Modified: core/trunk/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLI=
BLazyInitializer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyI=
nitializer.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyI=
nitializer.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -5,11 +5,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 =

-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.InvocationHandler;
-import net.sf.cglib.proxy.NoOp;
+import org.hibernate.repackage.cglib.proxy.Callback;
+import org.hibernate.repackage.cglib.proxy.CallbackFilter;
+import org.hibernate.repackage.cglib.proxy.Enhancer;
+import org.hibernate.repackage.cglib.proxy.InvocationHandler;
+import org.hibernate.repackage.cglib.proxy.NoOp;
 =

 import org.hibernate.HibernateException;
 import org.hibernate.LazyInitializationException;

Modified: core/trunk/core/src/main/java/org/hibernate/tool/instrument/cglib=
/InstrumentTask.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/tool/instrument/cglib/Instr=
umentTask.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/core/src/main/java/org/hibernate/tool/instrument/cglib/Instr=
umentTask.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -6,12 +6,12 @@
 import org.hibernate.bytecode.cglib.BytecodeProviderImpl;
 import org.hibernate.bytecode.ClassTransformer;
 import org.hibernate.tool.instrument.BasicInstrumentationTask;
-import org.objectweb.asm.ClassReader;
+import org.hibernate.repackage.cglib.asm.ClassReader;
 =

 import java.io.ByteArrayInputStream;
 =

-import net.sf.cglib.core.ClassNameReader;
-import net.sf.cglib.transform.impl.InterceptFieldEnabled;
+import org.hibernate.repackage.cglib.core.ClassNameReader;
+import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled;
 =

 /**
  * An Ant task for instrumenting persistent classes in order to enable

Modified: core/trunk/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/pom.xml	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/testsuite/pom.xml	2008-05-21 20:13:20 UTC (rev 14682)
@@ -34,15 +34,10 @@
             <version>3.4.GA</version>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-cglib-repack</artifactId>
             <version>2.1_3</version>
         </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-attrs</artifactId>
-            <version>1.5.3</version>
-        </dependency>
         <!-- optional dom4j dependency; needed here for dom4j (de)serializ=
ation -->
         <dependency>
             <groupId>jaxen</groupId>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cg=
lib/CGLIBThreadLocalTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CG=
LIBThreadLocalTest.java	2008-05-21 19:53:21 UTC (rev 14681)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CG=
LIBThreadLocalTest.java	2008-05-21 20:13:20 UTC (rev 14682)
@@ -7,10 +7,8 @@
 import org.hibernate.test.bytecode.*;
 import junit.framework.*;
 =

-import java.text.*;
 import java.lang.reflect.*;
 =

-import net.sf.cglib.proxy.*;
 =

 /**
  * Test that the static thread local callback object is cleared out of the=
 proxy class after instantiated.


--===============7398981452561432792==--

From hibernate-commits at lists.jboss.org Wed May 21 16:34:55 2008
Content-Type: multipart/mixed; boundary="===============6313009712178086782=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14683 -
 core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/access.
Date: Wed, 21 May 2008 16:34:55 -0400
Message-ID: <E1Jyv1T-0006OJ-0V@committer01.frg.pub.inap.atl.jboss.com>

--===============6313009712178086782==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-05-21 16:34:54 -0400 (Wed, 21 May 2008)
New Revision: 14683

Modified:
   core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/acce=
ss/OptimisticTransactionalAccessDelegate.java
Log:
Don't redundantly call ensureRegionRootExists()

Modified: core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jb=
c2/access/OptimisticTransactionalAccessDelegate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/acc=
ess/OptimisticTransactionalAccessDelegate.java	2008-05-21 20:13:20 UTC (rev=
 14682)
+++ core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/acc=
ess/OptimisticTransactionalAccessDelegate.java	2008-05-21 20:34:54 UTC (rev=
 14683)
@@ -89,7 +89,8 @@
     public Object get(Object key, long txTimestamp) throws CacheException
     {
         region.ensureRegionRootExists();
-        return super.get(key, txTimestamp);
+        =

+        return CacheHelper.get(cache, regionFqn, key);
     }
 =

     /**


--===============6313009712178086782==--

From hibernate-commits at lists.jboss.org Wed May 21 16:35:46 2008
Content-Type: multipart/mixed; boundary="===============1651770215361021921=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14684 -
 core/trunk/cache-jbosscache2.
Date: Wed, 21 May 2008 16:35:44 -0400
Message-ID: <E1Jyv2G-0007Fb-QS@committer01.frg.pub.inap.atl.jboss.com>

--===============1651770215361021921==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bstansberry(a)jboss.com
Date: 2008-05-21 16:35:44 -0400 (Wed, 21 May 2008)
New Revision: 14684

Modified:
   core/trunk/cache-jbosscache2/pom.xml
Log:
[HHH-2506 ] make javassist the default bytecode provider
[HHH-2875] cglib+asm repackage

Modified: core/trunk/cache-jbosscache2/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/cache-jbosscache2/pom.xml	2008-05-21 20:34:54 UTC (rev 14683)
+++ core/trunk/cache-jbosscache2/pom.xml	2008-05-21 20:35:44 UTC (rev 14684)
@@ -71,25 +71,13 @@
             <version>1.2.14</version>
             <scope>test</scope>
         </dependency>
-        <!-- these are optional on core :( and needed for testing -->
+        <!-- this is optional on core :( and needed for testing -->
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
             <version>3.4.GA</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.1_3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-attrs</artifactId>
-            <version>1.5.3</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 =

     <build>


--===============1651770215361021921==--

From hibernate-commits at lists.jboss.org Thu May 22 11:43:24 2008
Content-Type: multipart/mixed; boundary="===============7405525626510766437=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14686 - in core/trunk:
 testsuite/src/test/java/org/hibernate/test/cid and 1 other directory.
Date: Thu, 22 May 2008 11:43:24 -0400
Message-ID: <E1JzCwu-00089I-HY@committer01.frg.pub.inap.atl.jboss.com>

--===============7405525626510766437==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-22 11:43:24 -0400 (Thu, 22 May 2008)
New Revision: 14686

Added:
   core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWit=
hGeneratorTest.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseDetail=
.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecord=
.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecord=
.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecord=
IdGenerator.java
Modified:
   core/trunk/core/src/main/resources/org/hibernate/hibernate-mapping-3.0.d=
td
Log:
HHH-2060 : composite-id + generator

Modified: core/trunk/core/src/main/resources/org/hibernate/hibernate-mappin=
g-3.0.dtd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/resources/org/hibernate/hibernate-mapping-3.0.=
dtd	2008-05-22 15:01:15 UTC (rev 14685)
+++ core/trunk/core/src/main/resources/org/hibernate/hibernate-mapping-3.0.=
dtd	2008-05-22 15:43:24 UTC (rev 14686)
@@ -174,7 +174,7 @@
 key column. The class must implement java.io.Serializable and reimplement =
equals() =

 and hashCode(). -->
 =

-<!ELEMENT composite-id ( meta*, (key-property|key-many-to-one)+ )>
+<!ELEMENT composite-id ( meta*, (key-property|key-many-to-one)+, generator=
? )>
 	<!ATTLIST composite-id class CDATA #IMPLIED>
 	<!ATTLIST composite-id mapped (true|false) "false">
 	<!ATTLIST composite-id name CDATA #IMPLIED>

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeI=
dWithGeneratorTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWi=
thGeneratorTest.java	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWi=
thGeneratorTest.java	2008-05-22 15:43:24 UTC (rev 14686)
@@ -0,0 +1,505 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors =
as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, m=
odify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Founda=
tion.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANT=
ABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public=
 License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.cid;
+
+import java.util.Date;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+
+/**
+ * Tests the use of composite-id with a generator.  =

+ * Test this behavior in all the various entity states (transient, managed=
, detached) =

+ * and the different state transitions.
+ * =

+ * For HHH-2060.
+ * =

+ * @author Jacob Robertson
+ */
+public class CompositeIdWithGeneratorTest extends FunctionalTestCase {
+	=

+	public CompositeIdWithGeneratorTest(String str) {
+		super(str);
+	}
+
+	public String[] getMappings() {
+		return new String[] { "cid/PurchaseRecord.hbm.xml" };
+	}
+
+	public static Test suite() {
+		return new FunctionalTestClassTestSuite(CompositeIdWithGeneratorTest.cla=
ss);
+	}
+	=

+	/**
+	 * Basic test that id can be generated for composite-id.
+	 */
+	public void testCompositeIdSimple() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		// persist the record to get the id generated
+		PurchaseRecord record =3D new PurchaseRecord();
+		s.persist(record);
+
+		t.commit();
+		s.close();
+
+		// test that the id was generated
+		PurchaseRecord.Id generatedId =3D record.getId();
+		Date timestamp =3D record.getTimestamp();
+		assertNotNull(generatedId);
+		assertNotNull( generatedId.getPurchaseSequence() );
+		assertTrue(generatedId.getPurchaseNumber() > 0);
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		// find the record, and see that the ids match
+		PurchaseRecord find =3D (PurchaseRecord) s.get(PurchaseRecord.class, gen=
eratedId);
+		assertNotNull(find);
+		assertEquals( generatedId, find.getId() );
+		assertEquals( timestamp, find.getTimestamp() );
+
+		t.commit();
+		s.close();
+
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		// generate another new record
+		PurchaseRecord record2 =3D new PurchaseRecord();
+		s.persist(record2);
+		=

+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id generatedId2 =3D record2.getId();
+		Date timestamp2 =3D record2.getTimestamp();
+
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		PurchaseRecord find2 =3D (PurchaseRecord) s.get(PurchaseRecord.class, ge=
neratedId2);
+		=

+		t.commit();
+		s.close();
+		=

+		// test that the ids are different
+		PurchaseRecord.Id id1 =3D find.getId();
+		PurchaseRecord.Id id2 =3D find2.getId();
+		String seq1 =3D id1.getPurchaseSequence();
+		String seq2 =3D id2.getPurchaseSequence();
+		int num1 =3D id1.getPurchaseNumber();
+		int num2 =3D id2.getPurchaseNumber();
+		=

+		assertEquals( timestamp2, find2.getTimestamp() );
+		assertFalse( id1.equals(id2) );
+		assertFalse( seq1.equals(seq2) );
+		assertFalse(num1 =3D=3D num2);
+	}
+
+	/**
+	 * Tests the behavior of properties in detached objects.
+	 */
+	public void testDetachedProperty() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		// persist the record
+		PurchaseRecord record =3D new PurchaseRecord();
+		s.persist(record);
+		=

+		// close session so we know the record is detached
+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id generatedId =3D record.getId();
+
+		// change a non-id property, but do not persist
+		Date persistedTimestamp =3D record.getTimestamp();
+		Date newTimestamp =3D new Date(persistedTimestamp.getTime() + 1);
+		record.setTimestamp(newTimestamp);
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		PurchaseRecord find =3D (PurchaseRecord) s.get(PurchaseRecord.class, gen=
eratedId);
+		=

+		t.commit();
+		s.close();
+
+		// see that we get the original id, and the original timestamp
+		assertEquals( generatedId, find.getId() );
+		assertEquals( persistedTimestamp, find.getTimestamp() );
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		// update with the new timestamp
+		s.update(record);
+		=

+		t.commit();
+		s.close();
+		=

+		// find the newly updated record
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		PurchaseRecord find2 =3D (PurchaseRecord) s.get(PurchaseRecord.class, ge=
neratedId);
+		=

+		t.commit();
+		s.close();
+
+		// see that we get the original id, and the new timestamp
+		assertEquals( generatedId, find2.getId() );
+		assertEquals( newTimestamp, find2.getTimestamp() );
+	}
+
+	/**
+	 * Tests the behavior of the id in detached objects.
+	 */
+	public void testDetachedId() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		Date timestamp1 =3D new Date();
+		Date timestamp2 =3D new Date(timestamp1.getTime() + 1);
+
+		// persist two records
+		PurchaseRecord record1 =3D new PurchaseRecord();
+		record1.setTimestamp(timestamp1);
+		PurchaseRecord record2 =3D new PurchaseRecord();
+		record2.setTimestamp(timestamp2);
+		s.persist(record1);
+		s.persist(record2);
+		=

+		// close session so we know the records are detached
+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id generatedId1 =3D record1.getId();
+		PurchaseRecord.Id generatedId2 =3D record2.getId();
+		=

+		// change the ids around - effectively making record1 have the same id a=
s record2
+		// do not persist yet
+		PurchaseRecord.Id toChangeId1 =3D new PurchaseRecord.Id();
+		toChangeId1.setPurchaseNumber( record2.getId().getPurchaseNumber() );
+		toChangeId1.setPurchaseSequence( record2.getId().getPurchaseSequence() );
+		record1.setId(toChangeId1);
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		PurchaseRecord find1 =3D (PurchaseRecord) s.get(PurchaseRecord.class, ge=
neratedId1);
+		PurchaseRecord find2 =3D (PurchaseRecord) s.get(PurchaseRecord.class, ge=
neratedId2);
+		=

+		t.commit();
+		s.close();
+
+		// see that we get the original ids (and timestamps)
+		// i.e. weren't changed by changing the detached object
+		assertEquals( generatedId1, find1.getId() );
+		assertEquals( timestamp1, find1.getTimestamp() );
+		assertEquals( generatedId2, find2.getId() );
+		assertEquals( timestamp2, find2.getTimestamp() );
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		// update with the new changed record id
+		s.update(record1);
+		=

+		t.commit();
+		s.close();
+
+		// test that record1 did not get a new generated id, and kept record2's =
id
+		PurchaseRecord.Id foundId1 =3D record1.getId();
+		assertSame(toChangeId1, foundId1);
+		assertEquals( toChangeId1.getPurchaseNumber(), foundId1.getPurchaseNumbe=
r() );
+		assertEquals( toChangeId1.getPurchaseSequence(), foundId1.getPurchaseSeq=
uence() );
+		=

+		// find record 2 and see that it has the timestamp originally found in r=
ecord 1
+		s =3D openSession();
+		t =3D s.beginTransaction();
+		=

+		find2 =3D (PurchaseRecord) s.get(PurchaseRecord.class, generatedId2);
+		=

+		t.commit();
+		s.close();
+
+		// see that we get the original id (2), and the new timestamp (1)
+		assertEquals( timestamp1, find2.getTimestamp() );
+		assertEquals( generatedId2, find2.getId() );
+	}
+
+	/**
+	 * Tests the behavior of saveOrUpdate (as opposed to calling "persist").
+	 */
+	public void testSaveOrUpdate() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		Date timestamp1 =3D new Date();
+		Date timestamp2 =3D new Date(timestamp1.getTime() + 1);
+
+		// persist the record
+		PurchaseRecord record =3D new PurchaseRecord();
+		record.setTimestamp(timestamp1);
+		s.saveOrUpdate(record);
+		=

+		t.commit();
+		s.close();
+
+		// test that the id was generated
+		PurchaseRecord.Id generatedId =3D record.getId();
+		assertNotNull(generatedId);
+		assertNotNull( generatedId.getPurchaseSequence() );
+		=

+		// change the timestamp
+		record.setTimestamp(timestamp2);
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		s.saveOrUpdate(record);
+		=

+		t.commit();
+		s.close();
+
+		// see that we get the *same* id, and the new timestamp
+		assertSame( generatedId, record.getId() );
+		assertEquals( timestamp2, record.getTimestamp() );
+	}
+
+	/**
+	 * Tests the behavior of load.
+	 */
+	public void testLoad() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		// persist the record, then get the id and timestamp back
+		PurchaseRecord record =3D new PurchaseRecord();
+		s.persist(record);
+		=

+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id id =3D record.getId();
+		Date timestamp =3D record.getTimestamp();
+		=

+		// using the given id, load a transient record
+		PurchaseRecord toLoad =3D new PurchaseRecord();
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		s.load(toLoad, id);
+		=

+		t.commit();
+		s.close();
+		=

+		// show that the correct timestamp and ids were loaded
+		assertEquals( id, toLoad.getId() );
+		assertEquals( timestamp, toLoad.getTimestamp() );
+	}
+	=

+	/**
+	 * Tests the behavior of evict.
+	 */
+	public void testEvict() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		Date timestamp1 =3D new Date();
+		Date timestamp2 =3D new Date(timestamp1.getTime() + 1);
+		=

+		// persist the record, then evict it, then make changes to it ("within" =
the session)
+		PurchaseRecord record =3D new PurchaseRecord();
+		record.setTimestamp(timestamp1);
+		s.persist(record);
+		s.flush();
+		s.evict(record);
+		=

+		record.setTimestamp(timestamp2);
+		=

+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id generatedId =3D record.getId();
+		=

+		// now, re-fetch the record and show that the timestamp change wasn't pe=
rsisted
+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		PurchaseRecord persistent =3D (PurchaseRecord) s.get(PurchaseRecord.clas=
s, generatedId);
+		=

+		t.commit();
+		s.close();
+		=

+		assertEquals( generatedId, persistent.getId() );
+		assertEquals( timestamp1, persistent.getTimestamp() );
+	}
+	=

+	/**
+	 * Tests the behavior of merge.
+	 */
+	public void testMerge() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		Date timestamp1 =3D new Date();
+		Date timestamp2 =3D new Date(timestamp1.getTime() + 1);
+
+		// persist the record
+		PurchaseRecord record =3D new PurchaseRecord();
+		s.persist(record);
+		=

+		t.commit();
+		s.close();
+
+		// test that the id was generated
+		PurchaseRecord.Id generatedId =3D record.getId();
+		assertNotNull(generatedId);
+		assertNotNull( generatedId.getPurchaseSequence() );
+		=

+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		// update detached object, retrieve persistent object, then merge
+		PurchaseRecord detached =3D record;
+		detached.setTimestamp(timestamp2);
+		PurchaseRecord persistent =3D (PurchaseRecord) s.get(PurchaseRecord.clas=
s, generatedId);
+		=

+		// show that the timestamp hasn't changed
+		assertEquals( timestamp1, persistent.getTimestamp() );
+		=

+		s.merge(detached);
+		=

+		t.commit();
+		s.close();
+
+		// show that the persistent object was changed only after the session fl=
ush
+		assertEquals( timestamp2, persistent.getTimestamp() );
+		=

+		// show that the persistent store was updated - not just the in-memory o=
bject
+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		persistent =3D (PurchaseRecord) s.get(PurchaseRecord.class, generatedId);
+
+		t.commit();
+		s.close();
+		=

+		assertEquals( timestamp2, persistent.getTimestamp() );
+	}
+	=

+	/**
+	 * Tests the behavior of delete.
+	 */
+	public void testDelete() {
+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		// persist the record
+		PurchaseRecord record =3D new PurchaseRecord();
+		s.saveOrUpdate(record);
+		=

+		t.commit();
+		s.close();
+
+		PurchaseRecord.Id generatedId =3D record.getId();
+		=

+		// re-fetch, then delete the record
+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		PurchaseRecord find =3D (PurchaseRecord) s.get(PurchaseRecord.class, gen=
eratedId);
+		s.delete(find);
+		assertFalse( s.contains(find) );
+		=

+		t.commit();
+		s.close();
+
+		// attempt to re-fetch - show it was deleted
+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		find =3D (PurchaseRecord) s.get(PurchaseRecord.class, generatedId);
+
+		t.commit();
+		s.close();
+		=

+		assertNull(find);
+	}
+	=

+	/**
+	 * Simple test to demonstrate the ids can be generated even when using ch=
ildren.
+	 */
+	public void testGeneratedIdsWithChildren() {
+		=

+		Session s =3D openSession();
+		Transaction t =3D s.beginTransaction();
+
+		// set up the record and details
+		PurchaseRecord record =3D new PurchaseRecord();
+		Set details =3D record.getDetails();
+		details.add( new PurchaseDetail(record, "p(a)1", 1) );
+		details.add( new PurchaseDetail(record, "p(a)2", 2) );
+
+		s.persist(record);
+		=

+		t.commit();
+		s.close();
+		=

+		// show that the ids were generated (non-zero) and come out the same
+		int foundPurchaseNumber =3D record.getId().getPurchaseNumber();
+		String foundPurchaseSequence =3D record.getId().getPurchaseSequence();
+		assertNotNull( record.getId() );
+		assertTrue(foundPurchaseNumber > 0);
+		assertNotNull(foundPurchaseSequence);
+		=

+		// search on detail1 by itself and show it got the parent's id
+		s =3D openSession();
+		t =3D s.beginTransaction();
+
+		// perform a find to show that it will wire together fine
+		PurchaseRecord foundRecord =3D (PurchaseRecord) s.get(PurchaseRecord.cla=
ss,
+				new PurchaseRecord.Id(foundPurchaseNumber, foundPurchaseSequence)
+				);
+		=

+		t.commit();
+		s.close();
+
+		// some simple test to see it fetched
+		assertEquals( 2, foundRecord.getDetails().size() );
+	}
+
+}
+

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseDe=
tail.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseDetai=
l.java	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseDetai=
l.java	2008-05-22 15:43:24 UTC (rev 14686)
@@ -0,0 +1,81 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors =
as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, m=
odify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Founda=
tion.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANT=
ABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public=
 License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.cid;
+
+
+/**
+ * @author Jacob Robertson
+ */
+public class PurchaseDetail {
+	=

+	private PurchaseRecord purchaseRecord;
+	=

+	private String productId;
+	private int quantity;
+	=

+	public PurchaseDetail(PurchaseRecord record, String productId, int quanti=
ty) {
+		this.productId =3D productId;
+		this.quantity =3D quantity;
+		this.purchaseRecord =3D record;
+	}
+	public PurchaseDetail() {}
+	=

+	=

+	/**
+	 * @return the purchaseRecord
+	 */
+	public PurchaseRecord getPurchaseRecord() {
+		return purchaseRecord;
+	}
+	/**
+	 * @param purchaseRecord the purchaseRecord to set
+	 */
+	public void setPurchaseRecord(PurchaseRecord purchaseRecord) {
+		this.purchaseRecord =3D purchaseRecord;
+	}
+	/**
+	 * @return the quantity
+	 */
+	public int getQuantity() {
+		return quantity;
+	}
+	/**
+	 * @param quantity the quantity to set
+	 */
+	public void setQuantity(int quantity) {
+		this.quantity =3D quantity;
+	}
+	/**
+	 * @return the productId
+	 */
+	public String getProductId() {
+		return productId;
+	}
+	/**
+	 * @param productId the productId to set
+	 */
+	public void setProductId(String productId) {
+		this.productId =3D productId;
+	}
+}

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRe=
cord.hbm.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
d.hbm.xml	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
d.hbm.xml	2008-05-22 15:43:24 UTC (rev 14686)
@@ -0,0 +1,81 @@
+<?xml version=3D"1.0"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors=
 as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, =
modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Found=
ation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN=
TABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Publi=
c License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public Licen=
se
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  -->
+
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!-- =

+
+  This mapping demonstrates composite-id using a generator.
+
+-->
+
+<hibernate-mapping package=3D"org.hibernate.test.cid">
+
+    <class name=3D"PurchaseRecord">
+    	=

+    	<composite-id name=3D"id" =

+    		class=3D"PurchaseRecord$Id">
+    		<key-property name=3D"purchaseNumber"/>
+    		<key-property name=3D"purchaseSequence"/>
+    		<generator class=3D"org.hibernate.test.cid.PurchaseRecordIdGenerator=
"/>
+    	</composite-id>
+    	=

+		<set name=3D"details" =

+			lazy=3D"false" =

+			inverse=3D"true" =

+			cascade=3D"all">
+		    <key>
+			    <column name=3D"purchaseNumber"/>
+			    <column name=3D"purchaseSequence"/>
+		    </key>
+		    <one-to-many class=3D"PurchaseDetail"/>
+		</set>		=

+		=

+		<property name=3D"timestamp" column=3D"timestamp"/>
+    	=

+    </class>
+
+    <class name=3D"PurchaseDetail">
+    	=

+    	<id name=3D"productId" =

+    		type=3D"string" =

+    		column=3D"productId">
+    		<generator class=3D"assigned"/>
+    	</id>
+    	=

+    	<property name=3D"quantity"/>
+    	=

+ 		<many-to-one name=3D"purchaseRecord" =

+	        class=3D"PurchaseRecord"
+	        not-null=3D"true">
+	     	<column name=3D"purchaseNumber"/>
+	     	<column name=3D"purchaseSequence"/>
+	     </many-to-one>
+    	=

+    </class>
+
+</hibernate-mapping>

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRe=
cord.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
d.java	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
d.java	2008-05-22 15:43:24 UTC (rev 14686)
@@ -0,0 +1,130 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors =
as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, m=
odify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Founda=
tion.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANT=
ABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public=
 License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.cid;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Jacob Robertson
+ */
+public class PurchaseRecord {
+	public static class Id implements Serializable {
+		private int purchaseNumber;
+		private String purchaseSequence;
+
+		public Id(int purchaseNumber, String purchaseSequence) {
+			this.purchaseNumber =3D purchaseNumber;
+			this.purchaseSequence =3D purchaseSequence;
+		}
+		public Id() {}
+
+		/**
+		 * @return Returns the purchaseNumber.
+		 */
+		public int getPurchaseNumber() {
+			return purchaseNumber;
+		}
+		/**
+		 * @param purchaseNumber The purchaseNumber to set.
+		 */
+		public void setPurchaseNumber(int purchaseNumber) {
+			this.purchaseNumber =3D purchaseNumber;
+		}
+		/**
+		 * @return the purchaseSequence
+		 */
+		public String getPurchaseSequence() {
+			return purchaseSequence;
+		}
+		/**
+		 * @param purchaseSequence the purchaseSequence to set
+		 */
+		public void setPurchaseSequence(String purchaseSequence) {
+			this.purchaseSequence =3D purchaseSequence;
+		}
+		public int hashCode() {
+			return purchaseNumber + purchaseSequence.hashCode();
+		}
+		public boolean equals(Object other) {
+			if (other instanceof Id) {
+				Id that =3D (Id) other;
+				return purchaseSequence.equals(this.purchaseSequence) &&
+					that.purchaseNumber =3D=3D this.purchaseNumber;
+			}
+			else {
+				return false;
+			}
+		}
+	}
+
+	private Id id;
+	private Date timestamp =3D new Date();
+	private Set details =3D new HashSet();
+
+	public PurchaseRecord() {}
+
+	/**
+	 * @return Returns the id.
+	 */
+	public Id getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(Id id) {
+		this.id =3D id;
+	}
+
+	/**
+	 * @return the details
+	 */
+	public Set getDetails() {
+		return details;
+	}
+
+	/**
+	 * @param details the details to set
+	 */
+	public void setDetails(Set details) {
+		this.details =3D details;
+	}
+
+	/**
+	 * @return the timestamp
+	 */
+	public Date getTimestamp() {
+		return timestamp;
+	}
+
+	/**
+	 * @param timestamp the timestamp to set
+	 */
+	public void setTimestamp(Date timestamp) {
+		this.timestamp =3D timestamp;
+	}
+}

Added: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRe=
cordIdGenerator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
dIdGenerator.java	                        (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/PurchaseRecor=
dIdGenerator.java	2008-05-22 15:43:24 UTC (rev 14686)
@@ -0,0 +1,47 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors =
as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, m=
odify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Founda=
tion.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANT=
ABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public=
 License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.cid;
+
+import java.io.Serializable;
+
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.id.IdentityGenerator;
+
+/**
+ * Simple {@link IdentityGenerator} implementation for testing composite-i=
d.
+ * =

+ * @author Jacob Robertson
+ */
+public class PurchaseRecordIdGenerator extends IdentityGenerator {
+
+	private static int nextPurchaseNumber =3D 2;
+	private static int nextPurchaseSequence =3D 3;
+	=

+	public Serializable generate(SessionImplementor s, Object obj) {
+		return new PurchaseRecord.Id(
+				nextPurchaseNumber++, =

+				String.valueOf(nextPurchaseSequence++));
+	}
+	=

+}


--===============7405525626510766437==--

From hibernate-commits at lists.jboss.org Thu May 22 14:21:03 2008
Content-Type: multipart/mixed; boundary="===============5901435382136194715=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14687 - in search/trunk/src:
 java/org/hibernate/search/backend/impl and 7 other directories.
Date: Thu, 22 May 2008 14:21:01 -0400
Message-ID: <E1JzFPR-0002k1-Hz@committer01.frg.pub.inap.atl.jboss.com>

--===============5901435382136194715==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-22 14:21:01 -0400 (Thu, 22 May 2008)
New Revision: 14687

Modified:
   search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.java
   search/trunk/src/java/org/hibernate/search/backend/Worker.java
   search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingP=
rocessor.java
   search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWor=
ker.java
   search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplement=
or.java
   search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListe=
ner.java
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java
   search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
   search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvid=
er.java
   search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvide=
r.java
   search/trunk/src/java/org/hibernate/search/store/RAMDirectoryProvider.ja=
va
   search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java
   search/trunk/src/test/org/hibernate/search/test/HANTestCase.java
   search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlav=
eAndMasterDPTest.java
   search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.ja=
va
Log:
HSEARCH-199 close resources on SF.close() had to change the DirectoryProvid=
er API and the worker / QueueingProcess APIs

Modified: search/trunk/src/java/org/hibernate/search/backend/QueueingProces=
sor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.ja=
va	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.ja=
va	2008-05-22 18:21:01 UTC (rev 14687)
@@ -36,4 +36,10 @@
 	 * Rollback works
 	 */
 	void cancelWorks(WorkQueue workQueue);
+
+	/**
+	 * clean resources
+	 * This method should log errors rather than raise an exception
+	 */
+	void close();
 }

Modified: search/trunk/src/java/org/hibernate/search/backend/Worker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Worker.java	2008-05-=
22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/backend/Worker.java	2008-05-=
22 18:21:01 UTC (rev 14687)
@@ -16,4 +16,10 @@
 	void performWork(Work work, EventSource session);
 =

 	void initialize(Properties props, SearchFactoryImplementor searchFactoryI=
mplementor);
+
+	/**
+	 * clean resources
+	 * This method can return exceptions
+	 */
+	void close();
 }

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQu=
eueingProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -25,6 +25,8 @@
 import org.hibernate.search.backend.impl.lucene.LuceneBackendQueueProcesso=
rFactory;
 import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Batch work until #performWorks is called.
@@ -33,6 +35,9 @@
  * @author Emmanuel Bernard
  */
 public class BatchedQueueingProcessor implements QueueingProcessor {
+
+	private static final Logger log =3D LoggerFactory.getLogger( BatchedQueue=
ingProcessor.class );
+
 	private boolean sync;
 	private int batchSize;
 	private ExecutorService executorService;
@@ -157,14 +162,16 @@
 		workQueue.clear();
 	}
 =

-	@Override
-	public void finalize() throws Throwable {
-		super.finalize();
+	public void close() {
 		//gracefully stop
-		//TODO move to the SF close lifecycle
 		if ( executorService !=3D null && !executorService.isShutdown() ) {
 			executorService.shutdown();
-			executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS );
+			try {
+				executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS );
+			}
+			catch (InterruptedException e) {
+				log.error("Unable to property shut down asynchronous indexing work", e=
);
+			}
 		}
 	}
 =


Modified: search/trunk/src/java/org/hibernate/search/backend/impl/Transacti=
onalWorker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWo=
rker.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWo=
rker.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -49,4 +49,9 @@
 	public void initialize(Properties props, SearchFactoryImplementor searchF=
actory) {
 		this.queueingProcessor =3D new BatchedQueueingProcessor( searchFactory, =
props );
 	}
+
+	public void close() {
+		queueingProcessor.close();
+	}
+
 }

Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryIm=
plementor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -42,4 +42,6 @@
 	void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingPa=
rameters indexingParams);
 =

 	public String getIndexingStrategy();
+
+	public void close();
 }

Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEve=
ntListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -12,6 +12,7 @@
 import org.hibernate.event.PostInsertEventListener;
 import org.hibernate.event.PostUpdateEvent;
 import org.hibernate.event.PostUpdateEventListener;
+import org.hibernate.event.Destructible;
 import org.hibernate.search.backend.WorkType;
 import org.hibernate.search.backend.Work;
 import org.hibernate.search.engine.DocumentBuilder;
@@ -31,7 +32,7 @@
 //TODO work on sharing the same indexWriters and readers across a single p=
ost operation...
 //TODO implement and use a LockableDirectoryProvider that wraps a DP to ha=
ndle the lock inside the LDP
 public class FullTextIndexEventListener implements PostDeleteEventListener=
, PostInsertEventListener,
-		PostUpdateEventListener, Initializable {
+		PostUpdateEventListener, Initializable, Destructible {
 =

 	@SuppressWarnings( { "WeakerAccess" } )
 	protected boolean used;
@@ -87,4 +88,8 @@
 		Work work =3D new Work(entity, id, workType);
 		searchFactoryImplementor.getWorker().performWork( work, event.getSession=
() );
 	}
+
+	public void cleanup() {
+		searchFactoryImplementor.close();
+	}
 }

Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-22 18:21:01 UTC (rev 14687)
@@ -44,6 +44,8 @@
 import org.hibernate.search.store.DirectoryProviderFactory;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
 import org.apache.lucene.analysis.Analyzer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * @author Emmanuel Bernard
@@ -56,6 +58,8 @@
 		Version.touch();
 	}
 =

+	private final Logger log =3D LoggerFactory.getLogger( SearchFactoryImpl.c=
lass );
+
 	private Map<Class, DocumentBuilder<Object>> documentBuilders =3D new Hash=
Map<Class, DocumentBuilder<Object>>();
 	//keep track of the index modifiers per DirectoryProvider since multiple =
entity can use the same directory provider
 	private Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders =
=3D
@@ -68,6 +72,7 @@
 	private Map<String, FilterDef> filterDefinitions =3D new HashMap<String, =
FilterDef>();
 	private FilterCachingStrategy filterCachingStrategy;
 	private Map<String, Analyzer> analyzers;
+	private boolean stopped =3D false;
 =

 	/**
 	 * Each directory provider (index) can have its own performance settings.
@@ -113,6 +118,27 @@
 		return indexingStrategy;
 	}
 =

+	public void close() {
+		if (!stopped) {
+			stopped =3D true;
+			try {
+				worker.close();
+			}
+			catch (Exception e) {
+				log.error( "Worker raises an exception on close()", e );
+			}
+			//TODO move to DirectoryProviderFactory for cleaner
+			for (DirectoryProvider dp : lockableDirectoryProviders.keySet() ) {
+				try {
+					dp.stop();
+				}
+				catch (Exception e) {
+					log.error( "DirectoryProvider raises an exception on stop() ", e );
+				}
+			}
+		}
+	}
+
 	private void bindFilterDefs(XClass mappedXClass) {
 		FullTextFilterDef defAnn =3D mappedXClass.getAnnotation( FullTextFilterD=
ef.class );
 		if ( defAnn !=3D null ) {

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java=
	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java=
	2008-05-22 18:21:01 UTC (rev 14687)
@@ -30,11 +30,17 @@
 	 * Executed after initialize, this method set up the heavy process of sta=
rting up the DirectoryProvider
 	 * IO processing as well as backgroup processing are expected to be set u=
p here
 	 *
-	 * TODO stop() method, for now use finalize() =

 	 */
 	void start();
 =

 	/**
+	 * Executed when the search factory is closed. This method should stop an=
y background process as well as
+	 * releasing any resource.
+	 * This method should avoid raising exceptions and log potential errors i=
nstead
+	 */
+	void stop();
+
+	/**
 	 * Returns an initialized Lucene Directory. This method call <b>must</b> =
be threadsafe
 	 */
 	TDirectory getDirectory();

Modified: search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvi=
der.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.ja=
va	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.ja=
va	2008-05-22 18:21:01 UTC (rev 14687)
@@ -9,6 +9,8 @@
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 =

 /**
  * Use a Lucene FSDirectory
@@ -20,6 +22,8 @@
  * @author Sanne Grinovero
  */
 public class FSDirectoryProvider implements DirectoryProvider<FSDirectory>=
 {
+
+	private final Logger log =3D LoggerFactory.getLogger( FSDirectoryProvider=
.class );
 	=

 	private FSDirectory directory;
 	private String indexName;
@@ -42,6 +46,15 @@
 		//all the process is done in initialize
 	}
 =

+	public void stop() {
+		try {
+			directory.close();
+		}
+		catch (Exception e) {
+			log.error( "Unable to property close Lucene directory {}" + directory.g=
etFile(), e );
+		}
+	}
+
 	public FSDirectory getDirectory() {
 		return directory;
 	}

Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirector=
yProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvi=
der.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvi=
der.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -117,6 +117,18 @@
 		return 37 * hash + indexName.hashCode();
 	}
 =

+
+
+	public void stop() {
+		timer.cancel();
+		try {
+			directory.close();
+		}
+		catch (Exception e) {
+			log.error( "Unable to property close Lucene directory {}" + directory.g=
etFile(), e );
+		}
+	}
+
 	class TriggerTask extends TimerTask {
 =

 		private final ExecutorService executor;
@@ -194,10 +206,4 @@
 			log.trace( "Copy for {} took {} ms", indexName, (System.currentTimeMill=
is() - start) );
 		}
 	}
-
-	public void finalize() throws Throwable {
-		super.finalize();
-		timer.cancel();
-		//TODO find a better cycle from Hibernate core
-	}
 }

Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectory=
Provider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvid=
er.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvid=
er.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -226,9 +226,19 @@
 		}
 	}
 =

-	public void finalize() throws Throwable {
-		super.finalize();
+	public void stop() {
 		timer.cancel();
-		//TODO find a better cycle from Hibernate core
+		try {
+			directory1.close();
+		}
+		catch (Exception e) {
+			log.error( "Unable to property close Lucene directory {}" + directory1.=
getFile(), e );
+		}
+		try {
+			directory2.close();
+		}
+		catch (Exception e) {
+			log.error( "Unable to property close Lucene directory {}" + directory2.=
getFile(), e );
+		}
 	}
 }

Modified: search/trunk/src/java/org/hibernate/search/store/RAMDirectoryProv=
ider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/RAMDirectoryProvider.j=
ava	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/java/org/hibernate/search/store/RAMDirectoryProvider.j=
ava	2008-05-22 18:21:01 UTC (rev 14687)
@@ -41,6 +41,8 @@
 		return directory;
 	}
 =

+	public void stop() {}
+
 	@Override
 	public boolean equals(Object obj) {
 		// this code is actually broken since the value change after initialize =
call

Modified: search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java	20=
08-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java	20=
08-05-22 18:21:01 UTC (rev 14687)
@@ -190,6 +190,7 @@
 		}
 		s.getTransaction().commit();
 		s.close();
+		getSessions().close(); //run the searchfactory.close() operations
 	}
 =

 	public void testSearchOnDeletedIndex() throws Exception {

Modified: search/trunk/src/test/org/hibernate/search/test/HANTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/HANTestCase.java	2008-0=
5-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/test/org/hibernate/search/test/HANTestCase.java	2008-0=
5-22 18:21:01 UTC (rev 14687)
@@ -61,7 +61,7 @@
 	}
 =

 	protected void setUp() throws Exception {
-		if ( getSessions() =3D=3D null || lastTestClass !=3D getClass() ) {
+		if ( getSessions() =3D=3D null || getSessions().isClosed() || lastTestCl=
ass !=3D getClass() ) {
 			buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles=
() );
 			lastTestClass =3D getClass();
 		}

Modified: search/trunk/src/test/org/hibernate/search/test/directoryProvider=
/FSSlaveAndMasterDPTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSla=
veAndMasterDPTest.java	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSla=
veAndMasterDPTest.java	2008-05-22 18:21:01 UTC (rev 14687)
@@ -8,6 +8,7 @@
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
 import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.event.PostDeleteEventListener;
 import org.hibernate.event.PostInsertEventListener;
@@ -87,6 +88,10 @@
 		assertEquals("Third copy did not work out", 1, result.size() );
 =

 		fts2.close();
+		//run the searchfactory.close() operations
+		for ( SessionFactory sf : getSessionFactories() ) {
+			sf.close();
+		}
 	}
 =

 =

@@ -102,7 +107,7 @@
 =

 		File slave =3D new File(root, "slave");
 		slave.mkdir();
-
+		                                                                        =
    =

 		super.setUp();
 	}
 =


Modified: search/trunk/src/test/org/hibernate/search/test/worker/WorkerTest=
Case.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.j=
ava	2008-05-22 15:43:24 UTC (rev 14686)
+++ search/trunk/src/test/org/hibernate/search/test/worker/WorkerTestCase.j=
ava	2008-05-22 18:21:01 UTC (rev 14687)
@@ -77,6 +77,7 @@
 		while ( work.count < iteration - 1 ) {
 			Thread.sleep( 20 );
 		}
+		getSessions().close();
 		System.out.println( iteration + " iterations (8 tx per iteration) in " +=
 nThreads + " threads: " + ( System
 				.currentTimeMillis() - start ) );
 	}


--===============5901435382136194715==--

From hibernate-commits at lists.jboss.org Fri May 23 17:42:40 2008
Content-Type: multipart/mixed; boundary="===============5215780975097642720=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14689 -
 search/trunk/src/java/org/hibernate/search/engine.
Date: Fri, 23 May 2008 17:42:40 -0400
Message-ID: <E1Jzf28-0000Wl-GV@committer01.frg.pub.inap.atl.jboss.com>

--===============5215780975097642720==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-23 17:42:40 -0400 (Fri, 23 May 2008)
New Revision: 14689

Modified:
   search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplement=
or.java
Log:
typo

Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryIm=
plementor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-23 21:30:38 UTC (rev 14688)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-23 21:42:40 UTC (rev 14689)
@@ -39,6 +39,7 @@
 =

 	public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?=
> provider);
 =

+	//FIXME spelling error in method name:
 	void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingPa=
rameters indexingParams);
 =

 	public String getIndexingStrategy();


--===============5215780975097642720==--

From hibernate-commits at lists.jboss.org Mon May 26 19:04:53 2008
Content-Type: multipart/mixed; boundary="===============2339719175907478782=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14690 - in search/trunk:
 src/java/org/hibernate/search/backend and 3 other directories.
Date: Mon, 26 May 2008 19:04:53 -0400
Message-ID: <E1K0lkL-0000Ys-5g@committer01.frg.pub.inap.atl.jboss.com>

--===============2339719175907478782==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-26 19:04:52 -0400 (Mon, 26 May 2008)
New Revision: 14690

Added:
   search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedP=
roperty.java
   search/trunk/src/test/org/hibernate/search/test/configuration/MaskedProp=
ertiesTest.java
Modified:
   search/trunk/doc/reference/en/modules/batchindex.xml
   search/trunk/doc/reference/en/modules/configuration.xml
   search/trunk/doc/reference/en/modules/optimize.xml
   search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParamet=
ers.java
   search/trunk/src/java/org/hibernate/search/backend/configuration/IndexWr=
iterSetting.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactor=
y.java
   search/trunk/src/test/org/hibernate/search/test/configuration/Configurat=
ionReadTestCase.java
   search/trunk/src/test/org/hibernate/search/test/configuration/LuceneInde=
xingParametersTest.java
   search/trunk/src/test/org/hibernate/search/test/configuration/ShardsConf=
igurationTest.java
Log:
HSEARCH-200: more IndexWriter settings available, some changes about config=
uration parsing;
Also includes related Documentation changes, and some unrelated documentati=
on typos.

Modified: search/trunk/doc/reference/en/modules/batchindex.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/doc/reference/en/modules/batchindex.xml	2008-05-23 21:42:4=
0 UTC (rev 14689)
+++ search/trunk/doc/reference/en/modules/batchindex.xml	2008-05-26 23:04:5=
2 UTC (rev 14690)
@@ -42,13 +42,17 @@
 =

     <para>Other parameters which also can affect indexing time and memory
     consumption are
-    <literal>hibernate.search.[default|&lt;indexname&gt;].batch.merge_fact=
or</literal>
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.max_buffered_docs</literal>
     ,
-    <literal>hibernate.search.[default|&lt;indexname&gt;].batch.max_merge_=
docs</literal>
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.max_field_length</literal>
     ,
-    <literal>hibernate.search.[default|&lt;indexname&gt;].batch.max_buffer=
ed_docs</literal>
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.max_merge_docs</literal>
+    ,
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.merge_factor</literal>
+    ,
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.ram_buffer_size</literal>
     and
-    <literal>hibernate.search.[default|&lt;indexname&gt;].batch.ram_buffer=
_size</literal>
+    <literal>hibernate.search.[default|&lt;indexname&gt;].indexwriter.batc=
h.term_index_interval</literal>
     . These parameters are Lucene specific and Hibernate Search is just
     passing these paramters through - see <xref
     linkend=3D"lucene-indexing-performance" /> for more details.</para>
@@ -108,7 +112,7 @@
     <note>
       <para>Methods <methodname>index</methodname>,
       <methodname>purge</methodname> and <methodname>purgeAll</methodname>=
 are
-      available on <classname>FullTextEntityManager</classname> as well</p=
ara>
+      available on <classname>FullTextEntityManager</classname> as well.</=
para>
     </note>
   </section>
 </chapter>

Modified: search/trunk/doc/reference/en/modules/configuration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/doc/reference/en/modules/configuration.xml	2008-05-23 21:4=
2:40 UTC (rev 14689)
+++ search/trunk/doc/reference/en/modules/configuration.xml	2008-05-26 23:0=
4:52 UTC (rev 14690)
@@ -400,7 +400,7 @@
 =

       <programlisting>@MessageDriven(activationConfig =3D {
       @ActivationConfigProperty(propertyName=3D"destinationType", property=
Value=3D"javax.jms.Queue"),
-      @ActivationConfigProperty(propertyName=3D"destination", propertyValu=
e=3D"queue/hiebrnatesearch"),
+      @ActivationConfigProperty(propertyName=3D"destination", propertyValu=
e=3D"queue/hibernatesearch"),
       @ActivationConfigProperty(propertyName=3D"DLQMaxResent", propertyVal=
ue=3D"1")
    } )
 public class MDBSearchController extends AbstractJMSHibernateSearchControl=
ler implements MessageListener {
@@ -556,7 +556,7 @@
     </section>
   </section>
 =

-  <section id=3D"lucene-indexing-performance" revision=3D"2">
+  <section id=3D"lucene-indexing-performance" revision=3D"3">
     <title>Tuning Lucene indexing performance</title>
 =

     <para>Hibernate Search allows you to tune the Lucene indexing performa=
nce
@@ -564,54 +564,41 @@
     Lucene <literal>IndexWriter</literal> such as
     <literal>mergeFactor</literal>, <literal>maxMergeDocs</literal> and
     <literal>maxBufferedDocs</literal>. You can specify these parameters
-    either as default values applying for all indexes or on a per index
-    basis.</para>
+    either as default values applying for all indexes, on a per index
+    basis, or even per shard.</para>
 =

     <para>There are two sets of parameters allowing for different performa=
nce
     settings depending on the use case. During indexing operations trigger=
ed
-    by database modifications, the following ones are used: <itemizedlist>
-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].tran=
saction.merge_factor</literal></para>
-        </listitem>
+    by database modifications, the parameters are grouped by the
+    <literal>transaction</literal> keyword:
+    <programlisting>hibernate.search.[default|&lt;indexname&gt;].indexwrit=
er.transaction.&lt;parameter_name&gt;</programlisting>
+    When indexing occurs via <literal>FullTextSession.index()</literal> (s=
ee <xref
+    linkend=3D"search-batchindex" />), the used properties are those group=
ed under the <literal>batch</literal> keyword:
+    <programlisting>hibernate.search.[default|&lt;indexname&gt;].indexwrit=
er.batch.&lt;parameter_name&gt;</programlisting>
+    </para>
 =

-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].tran=
saction.max_merge_docs</literal></para>
-        </listitem>
-
-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].tran=
saction.max_buffered_docs</literal></para>
-        </listitem>
-        =

-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].tran=
saction.ram_buffer_size</literal></para>
-        </listitem>
-      </itemizedlist>When indexing occurs via
-    <literal>FullTextSession.index()</literal> (see <xref
-    linkend=3D"search-batchindex" />), the following properties are used:
-    <itemizedlist>
-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].batc=
h.merge_factor</literal></para>
-        </listitem>
-
-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].batc=
h.max_merge_docs</literal></para>
-        </listitem>
-
-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].batc=
h.max_buffered_docs</literal></para>
-        </listitem>
-        =

-        <listitem>
-          <para><literal>hibernate.search.[default|&lt;indexname&gt;].batc=
h.ram_buffer_size</literal></para>
-        </listitem>
-      </itemizedlist></para>
-
     <para>Unless the corresponding <literal>.batch</literal> property is
     explicitly set, the value will default to the
-    <literal>.transaction</literal> property.</para>
+    <literal>.transaction</literal> property.
+    If no value is set for a <literal>.batch</literal> value in a specific=
 shard configuration,
+    Hibernate Search will look at the index section, then at the default s=
ection and after that
+    it will look for a <literal>.transaction</literal> in the same order:
+    <programlisting>
+    hibernate.search.Animals.2.indexwriter.transaction.max_merge_docs 10
+    hibernate.search.Animals.2.indexwriter.transaction.merge_factor 20
+    hibernate.search.default.indexwriter.batch.max_merge_docs 100</program=
listing>
+    This configuration will result in these settings applied to the second=
 shard of Animals index:
+    <itemizedlist>
+    	<listitem><literal>transaction.max_merge_docs</literal> =3D 10</listi=
tem>
+        <listitem><literal>batch.max_merge_docs</literal> =3D 100</listite=
m>
+        <listitem><literal>transaction.merge_factor</literal> =3D 20</list=
item>
+        <listitem><literal>batch.merge_factor</literal> =3D 20</listitem>
+    </itemizedlist>
+    All other values will use the defaults defined in Lucene.
+    </para>
 =

     <para>
-    The default for all values is to leave them at Lucene's own default,
+    The default for all values is to leave them at Lucene&#39;s own defaul=
t,
     so the listed values in the following table actually depend on the
     version of Lucene you are using;
     values shown are relative to version <literal>2.3</literal>.
@@ -633,62 +620,60 @@
         </thead>
 =

         <tbody>
+        =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].t=
ransaction.merge_factor</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].max_buffered_delete_terms</literal></entry>
 =

-            <entry><para>Controls segment merge frequency and size. </para>
-            <para>Determines how often segment indices are merged when
-            insertion occurs. With smaller values, less RAM is used while
-            indexing, and searches on unoptimized indices are faster, but
-            indexing speed is slower. With larger values, more RAM is used
-            during indexing, and while searches on unoptimized indices are
-            slower, indexing is faster. Thus larger values (&gt; 10) are b=
est
-            for batch index creation, and smaller values (&lt; 10) for ind=
ices
-            that are interactively maintained. The value must no be lower =
than
-            2.</para> <para>Used by Hibernate Search during index update
-            operations as part of database modifications.</para></entry>
+            <entry><para>Determines the minimal number of delete terms req=
uired before the buffered
+			in-memory delete terms are applied and flushed. If there are documents
+			buffered in memory at the time, they are merged and a new segment is
+   			created.</para></entry>
 =

-            <entry>10</entry>
+            <entry>Disabled (flushes by RAM usage)</entry>
           </row>
 =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].t=
ransaction.max_merge_docs</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].max_buffered_docs</literal></entry>
 =

-            <entry><para>Defines the largest number of documents allowed i=
n a
-            segment.</para> <para>Used by Hibernate Search during index up=
date
-            operations as part of database modifications.</para></entry>
+            <entry><para>Controls the amount of documents buffered in memo=
ry
+            during indexing. The bigger the more RAM is consumed.</para>
+           </entry>
 =

-            <entry>Unlimited (Integer.MAX_VALUE)</entry>
+            <entry>Disabled (flushes by RAM usage)</entry>
           </row>
 =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].t=
ransaction.max_buffered_docs</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].max_field_length</literal></entry>
 =

-            <entry><para>Controls the amount of documents buffered in memo=
ry
-            during indexing. The bigger the more RAM is consumed.</para>
-            <para>Used by Hibernate Search during index update operations =
as
-            part of database modifications.</para></entry>
+            <entry><para>The maximum number of terms that will be indexed =
for a single field.
+            This limits the amount of memory required for indexing so that=
 very large data will not crash the indexing process by
+			running out of memory. This setting refers to the number of running ter=
ms,
+			not to the number of different terms.</para>
+			<para>This silently truncates large documents, excluding from the index=
 all terms that occur further in the document.
+			If you know your source documents are large, be sure to set this value =
high enough to accomodate the expected size. =

+			If you set it to Integer.MAX_VALUE, then the only limit is your memory,=
 but you should anticipate an OutOfMemoryError.
+			</para>
+			<para>If setting this value in <literal>batch</literal> differently tha=
n in <literal>transaction</literal>
+			you may get different data (and results) in your index depending on the=
 indexing mode.</para>
+           </entry>
 =

-            <entry>Disabled (not set)</entry>
+            <entry>10000</entry>
           </row>
           =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].t=
ransaction.ram_buffer_size</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].max_merge_docs</literal></entry>
 =

-            <entry><para>Controls the amount of RAM in MB dedicated to doc=
ument buffers.
-            When used together max_buffered_docs a flush occurs for whiche=
ver event happens first.</para>
-            <para>Generally for faster indexing performance it's best to f=
lush by RAM usage instead of document
-   			count and use as large a RAM buffer as you can.</para>
-            <para>Used by Hibernate Search during index update operations =
as
-            part of database modifications.</para></entry>
+            <entry><para>Defines the largest number of documents allowed i=
n a segment.
+            Larger values are best for batched indexing and speedier searc=
hes.
+            Small values are best for transaction indexing.</para></entry>
 =

-            <entry>16 MB</entry>
+            <entry>Unlimited (Integer.MAX_VALUE)</entry>
           </row>
 =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].b=
atch.merge_factor</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].merge_factor</literal></entry>
 =

-            <entry><para>Controls segment merge frequency and size.</para>
+            <entry><para>Controls segment merge frequency and size. </para>
             <para>Determines how often segment indices are merged when
             insertion occurs. With smaller values, less RAM is used while
             indexing, and searches on unoptimized indices are faster, but
@@ -697,45 +682,34 @@
             slower, indexing is faster. Thus larger values (&gt; 10) are b=
est
             for batch index creation, and smaller values (&lt; 10) for ind=
ices
             that are interactively maintained. The value must no be lower =
than
-            2.</para> <para>Used during indexing via
-            <literal>FullTextSession.index()</literal></para></entry>
+            2.</para></entry>
 =

             <entry>10</entry>
           </row>
 =

           <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].b=
atch.max_merge_docs</literal></entry>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].ram_buffer_size</literal></entry>
 =

-            <entry><para>Defines the largest number of documents allowed i=
n a
-            segment.</para> <para>Used during indexing via
-            <literal>FullTextSession.index()</literal></para></entry>
-
-            <entry>Unlimited (Integer.MAX_VALUE)</entry>
-          </row>
-
-          <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].b=
atch.max_buffered_docs</literal></entry>
-
-            <entry><para>Controls the amount of documents buffered in memo=
ry
-            during indexing. The bigger the more RAM is consumed.</para>
-            <para>Used during indexing via
-            <literal>FullTextSession.index()</literal></para></entry>
-
-            <entry>Disabled (not set)</entry>
-          </row>
-          =

-          <row>
-            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].b=
atch.ram_buffer_size</literal></entry>
-
             <entry><para>Controls the amount of RAM in MB dedicated to doc=
ument buffers.
             When used together max_buffered_docs a flush occurs for whiche=
ver event happens first.</para>
             <para>Generally for faster indexing performance it's best to f=
lush by RAM usage instead of document
    			count and use as large a RAM buffer as you can.</para>
-            <para>Used during indexing via
-            <literal>FullTextSession.index()</literal></para></entry>
+            </entry>
 =

             <entry>16 MB</entry>
           </row>
+          <row>
+            <entry><literal>hibernate.search.[default|&lt;indexname&gt;].i=
ndexwriter.[transaction|batch].term_index_interval</literal></entry>
+
+            <entry><para>Expert: Set the interval between indexed terms.</=
para>
+            <para>Large values cause less memory to be used by IndexReader=
, but slow random-access to terms.
+            Small values cause more memory to be used by an IndexReader, a=
nd speed
+   			random-access to terms. See Lucene documentation for more details.</=
para>
+            </entry>
+
+            <entry>128</entry>
+          </row>
+
         </tbody>
       </tgroup>
     </table>

Modified: search/trunk/doc/reference/en/modules/optimize.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/doc/reference/en/modules/optimize.xml	2008-05-23 21:42:40 =
UTC (rev 14689)
+++ search/trunk/doc/reference/en/modules/optimize.xml	2008-05-26 23:04:52 =
UTC (rev 14690)
@@ -4,8 +4,8 @@
   <title>Index Optimization</title>
 =

   <para>From time to time, the Lucene index needs to be optimized. The pro=
cess
-  is essentially a defragmentation: until the optimization occurs, deleted
-  documents are just marked as such, no physical deletion is applied, the
+  is essentially a defragmentation: until the optimization occurs deleted
+  documents are just marked as such, no physical deletion is applied; the
   optimization can also adjust the number of files in the Lucene
   Directory.</para>
 =

@@ -46,7 +46,6 @@
 =

     <programlisting>hibernate.search.default.optimizer.operation_limit.max=
 =3D 1000
 hibernate.search.default.optimizer.transaction_limit.max =3D 100
-
 hibernate.search.Animal.optimizer.transaction_limit.max =3D 50</programlis=
ting>
 =

     <para>An optimization will be triggered to the <literal>Animal</litera=
l>
@@ -65,7 +64,7 @@
       </listitem>
     </itemizedlist>
 =

-    <para>If none of these parameters are defined, not optimization is
+    <para>If none of these parameters are defined, no optimization is
     processed automatically.</para>
   </section>
 =

@@ -73,14 +72,14 @@
     <title>Manual optimization</title>
 =

     <para>You can programmatically optimize (defragment) a Lucene index fr=
om
-    Hibernate Search through the <classname>SearchFactory</classname></par=
a>
+    Hibernate Search through the <classname>SearchFactory</classname>:</pa=
ra>
 =

-    <programlisting>searchFactory.optimize(Order.class);
+    <programlisting>searchFactory.optimize(Order.class);</programlisting>
 =

-searchFactory.optimize();</programlisting>
+	<programlisting>searchFactory.optimize();</programlisting>
 =

-    <para>The first example reindex the Lucene index holding
-    <classname>Order</classname>s, the second, optimize all indexes.</para>
+    <para>The first example optimizes the Lucene index holding
+    <classname>Order</classname>s; the second, optimizes all indexes.</par=
a>
 =

     <para>The <classname>SearchFactory</classname> can be accessed from a
     <classname>FullTextSession</classname>:</para>
@@ -97,15 +96,17 @@
     <title>Adjusting optimization</title>
 =

     <para>Apache Lucene has a few parameters to influence how optimization=
 is
-    performed. Hibernate Search expose those parameters.</para>
+    performed. Hibernate Search exposes those parameters.</para>
 =

-    <para>Further index optimisation parameters include
-    <literal>hibernate.search.[default|&lt;indexname&gt;].[batch|transacti=
on].merge_factor</literal>,
-    <literal>hibernate.search.[default|&lt;indexname&gt;].[batch|transacti=
on].max_merge_docs</literal>,
-    <literal>hibernate.search.[default|&lt;indexname&gt;].[batch|transacti=
on].max_buffered_docs</literal>
-    and
-    <literal>hibernate.search.[default|&lt;indexname&gt;].[batch|transacti=
on].ram_buffer_size</literal>
-    - see <xref linkend=3D"lucene-indexing-performance" /> for more
-    details.</para>
+    <para>Further index optimisation parameters include:
+    <itemizedlist>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].max_buffered_docs</literal></listitem>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].max_field_length</literal></listitem>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].max_merge_docs</literal></listitem>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].merge_factor</literal></listitem>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].ram_buffer_size</literal></listitem>
+		<listitem><literal>hibernate.search.[default|&lt;indexname&gt;].indexwri=
ter.[batch|transaction].term_index_interval</literal></listitem>
+	</itemizedlist>
+    See <xref linkend=3D"lucene-indexing-performance" /> for more details.=
</para>
   </section>
 </chapter>

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexing=
Parameters.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -1,107 +1,131 @@
-//$Id$
-package org.hibernate.search.backend;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.lucene.index.IndexWriter;
-import org.hibernate.search.SearchException;
-import org.hibernate.search.backend.configuration.IndexWriterSetting;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wrapper class around the Lucene indexing parameters <i>mergeFactor</i>,=
 <i>maxMergeDocs</i>,
- * <i>maxBufferedDocs</i>, <i>termIndexInterval</i>, <i>RAMBufferSizeMB</i=
>.
- * <p>
- * There are two sets of these parameters. One is for regular indexing the=
 other is for batch indexing
- * triggered by <code>FullTextSessoin.index(Object entity)</code>
- * =

- * @author Hardy Ferentschik
- * @author Sanne Grinovero
- */
-public class LuceneIndexingParameters implements Serializable {
-
-	// value keyword
-	public static final String EXPLICIT_DEFAULT_VALUE =3D "default"; =

-	// property path keywords
-	public static final String BATCH =3D "batch";
-	public static final String TRANSACTION =3D "transaction";
-	=

-	private final ParameterSet transactionIndexParameters;
-	private final ParameterSet batchIndexParameters;
-	=

-	public LuceneIndexingParameters( Properties sourceProps ) {
-		Properties transactionProps =3D new Properties();
-		Properties batchProps =3D new Properties( transactionProps ); // transac=
tion settings is the default for batch
-		//don't iterate on property entries we know all the keys:
-		for ( IndexWriterSetting t : IndexWriterSetting.values() ) {
-			String key =3D t.getKey();
-			String trxValue =3D sourceProps.getProperty( TRANSACTION + "." + key );
-			if (trxValue !=3D null) {
-				transactionProps.setProperty( key, trxValue );
-			}
-			String batchValue =3D sourceProps.getProperty( BATCH + "." + key );
-			if (batchValue !=3D null) {
-				batchProps.setProperty( key, batchValue );
-			}
-		}
-		transactionIndexParameters =3D new ParameterSet(transactionProps);
-		batchIndexParameters =3D new ParameterSet(batchProps);
-	}
-
-	public ParameterSet getTransactionIndexParameters() {
-		return transactionIndexParameters;
-	}
-
-	public ParameterSet getBatchIndexParameters() {
-		return batchIndexParameters;
-	}
-
-	public class ParameterSet implements Serializable {
-		=

-		final Map<IndexWriterSetting, Integer> parameters =3D new HashMap<IndexW=
riterSetting, Integer>();
-		=

-		public ParameterSet(Properties prop) {
-			for ( IndexWriterSetting t : IndexWriterSetting.values() ) {
-				String value =3D prop.getProperty( t.getKey() );
-				if ( ! (value=3D=3Dnull || EXPLICIT_DEFAULT_VALUE.equals(value) ) ) {
-					parameters.put( t, t.parseVal(value) );
-				}
-			}
-		}
-		=

-		/**
-		 * Applies the parameters represented by this to a writer.
-		 * Undefined parameters are not set, leaving the lucene default.
-		 * @param writer the IndexWriter whereto the parameters will be applied.
-		 */
-		public void applyToWriter(IndexWriter writer) {
-			for ( Map.Entry<IndexWriterSetting,Integer> entry : parameters.entrySet=
() ) {
-				try {
-					entry.getKey().applySetting( writer, entry.getValue() );
-				} catch ( IllegalArgumentException e ) {
-					//TODO if DirectoryProvider had getDirectoryName() exceptions could t=
ell better
-					throw new SearchException( "Illegal IndexWriter setting "
-							+ entry.getKey().getKey() + " "+ e.getMessage(), e );
-				}
-			}
-		}
-		=

-		public Integer getCurrentValueFor(IndexWriterSetting ws){
-			return parameters.get(ws);
-		}
-		=

-		public void setCurrentValueFor(IndexWriterSetting ws, Integer newValue){
-			if (newValue=3D=3Dnull){
-				parameters.remove(ws);
-			} else {
-				parameters.put(ws, newValue);
-			}
-		}
-
- 	}
-	=

-}
+//$Id$
+package org.hibernate.search.backend;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.lucene.index.IndexWriter;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.backend.configuration.IndexWriterSetting;
+import org.hibernate.search.backend.configuration.MaskedProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hibernate.search.backend.configuration.IndexWriterSettin=
g.MAX_FIELD_LENGTH;
+
+/**
+ * Wrapper class around the Lucene indexing parameters defined in IndexWri=
terSetting.
+ * <p>
+ * There are two sets of these parameters. One is for regular indexing the=
 other is for batch indexing
+ * triggered by <code>FullTextSessoin.index(Object entity)</code>
+ *
+ * @author Hardy Ferentschik
+ * @author Sanne Grinovero
+ */
+public class LuceneIndexingParameters implements Serializable {
+
+	private static final long serialVersionUID =3D 5424606407623591663L;
+	private static Logger log =3D LoggerFactory.getLogger( LuceneIndexingPara=
meters.class );
+	=

+	// value keyword
+	public static final String EXPLICIT_DEFAULT_VALUE =3D "default";
+	// property path keywords
+	public static final String BATCH =3D "batch";
+	public static final String TRANSACTION =3D "transaction";
+	public static final String PROP_GROUP =3D "indexwriter";
+	=

+	private final ParameterSet transactionIndexParameters;
+	private final ParameterSet batchIndexParameters;
+	=

+	public LuceneIndexingParameters( Properties sourceProps ) {
+		//prefer keys under "indexwriter" but fallback for backwards compatibili=
ty:
+		Properties indexingParameters =3D new MaskedProperty( sourceProps, PROP_=
GROUP, sourceProps );
+		//get keys for "transaction"
+		Properties transactionProps =3D new MaskedProperty( indexingParameters, =
TRANSACTION );
+		//get keys for "batch" (defaulting to transaction)
+		Properties batchProps =3D new MaskedProperty( indexingParameters, BATCH,=
 transactionProps ); //TODO to close HSEARCH-201 just remove 3=C2=B0 parame=
ter
+		transactionIndexParameters =3D new ParameterSet( transactionProps, TRANS=
ACTION );
+		batchIndexParameters =3D new ParameterSet( batchProps, BATCH );
+		doSanityChecks( transactionIndexParameters, batchIndexParameters );
+	}
+
+	private void doSanityChecks(ParameterSet transParams, ParameterSet batchP=
arams) {
+		if ( log.isWarnEnabled() ) {
+			Integer maxFieldLengthTransaction =3D transParams.parameters.get( MAX_F=
IELD_LENGTH );
+			Integer maxFieldLengthBatch =3D transParams.parameters.get( MAX_FIELD_L=
ENGTH );
+			if ( notEquals( maxFieldLengthTransaction, maxFieldLengthBatch ) ){
+				log.warn( "The max_field_length value configured for transaction is di=
fferent than the value configured for batch." );
+			}
+		}
+	}
+
+	private boolean notEquals(Integer a, Integer b) {
+		if ( a=3D=3Dnull && b=3D=3Dnull ) return false;
+		if ( a=3D=3Dnull && b!=3Dnull ) return true;
+		if ( a!=3Dnull && b=3D=3Dnull ) return true;
+		return a.intValue() !=3D b.intValue();
+	}
+
+	public ParameterSet getTransactionIndexParameters() {
+		return transactionIndexParameters;
+	}
+
+	public ParameterSet getBatchIndexParameters() {
+		return batchIndexParameters;
+	}
+
+	public class ParameterSet implements Serializable {
+		=

+		private static final long serialVersionUID =3D -6121723702279869524L;
+		=

+		final Map<IndexWriterSetting, Integer> parameters =3D new HashMap<IndexW=
riterSetting, Integer>();
+		=

+		public ParameterSet(Properties prop, String paramName) {
+			//don't iterate on property entries as we know all the keys:
+			for ( IndexWriterSetting t : IndexWriterSetting.values() ) {
+				String key =3D t.getKey();
+				String value =3D prop.getProperty( key );
+				if ( ! ( value=3D=3Dnull || EXPLICIT_DEFAULT_VALUE.equalsIgnoreCase( v=
alue ) ) ) {
+					if ( log.isDebugEnabled() ) {
+						//TODO add DirectoryProvider name when available to log message
+						log.debug( "Set indexwriter parameter " + paramName +"." + key + " t=
o value : "+ value );
+					}
+					parameters.put( t, t.parseVal( value ) );
+				}
+			}
+		}
+		=

+		/**
+		 * Applies the parameters represented by this to a writer.
+		 * Undefined parameters are not set, leaving the lucene default.
+		 * @param writer the IndexWriter whereto the parameters will be applied.
+		 */
+		public void applyToWriter(IndexWriter writer) {
+			for ( Map.Entry<IndexWriterSetting,Integer> entry : parameters.entrySet=
() ) {
+				try {
+					entry.getKey().applySetting( writer, entry.getValue() );
+				} catch ( IllegalArgumentException e ) {
+					//TODO if DirectoryProvider had getDirectoryName() exceptions could t=
ell better
+					throw new SearchException( "Illegal IndexWriter setting "
+							+ entry.getKey().getKey() + " "+ e.getMessage(), e );
+				}
+			}
+		}
+		=

+		public Integer getCurrentValueFor(IndexWriterSetting ws){
+			return parameters.get(ws);
+		}
+
+		public void setCurrentValueFor(IndexWriterSetting ws, Integer newValue){
+			if (newValue=3D=3Dnull){
+				parameters.remove(ws);
+			} else {
+				parameters.put(ws, newValue);
+			}
+		}
+
+ 	}
+
+}

Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/=
IndexWriterSetting.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/configuration/IndexW=
riterSetting.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/IndexW=
riterSetting.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -5,32 +5,73 @@
 import org.apache.lucene.index.IndexWriter;
 import org.hibernate.search.SearchException;
 =

+/**
+ * Represents possible options to be applied to an
+ * <code>org.apache.lucene.index.IndexWriter</code>
+ * =

+ * @author Sanne Grinovero
+ */
 public enum IndexWriterSetting implements Serializable {
-	=

-	MERGE_FACTOR( "merge_factor" ) {
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setMaxBufferedDeleteTerms(int)
+	 */
+	MAX_BUFFERED_DELETE_TERMS( "max_buffered_delete_terms" ) {
 		public void applySetting(IndexWriter writer, int value) {
-			writer.setMergeFactor( value );
+			writer.setMaxBufferedDeleteTerms( value );
 		}
 	} ,
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setMaxBufferedDocs(int)
+	 */
+	MAX_BUFFERED_DOCS( "max_buffered_docs" ) {
+		public void applySetting(IndexWriter writer, int value) {
+			writer.setMaxBufferedDocs( value );
+		}
+	} ,
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setMaxFieldLength(int)
+	 */
+	MAX_FIELD_LENGTH( "max_field_length" ) {
+		public void applySetting(IndexWriter writer, int value) {
+			writer.setMaxFieldLength( value );
+		}
+	} ,
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setMaxMergeDocs(int)
+	 */
 	MAX_MERGE_DOCS( "max_merge_docs" ) {
 		public void applySetting(IndexWriter writer, int value) {
 			writer.setMaxMergeDocs( value );
 		}
 	} ,
-	MAX_BUFFERED_DOCS( "max_buffered_docs" ) {
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setMergeFactor(int)
+	 */
+	MERGE_FACTOR( "merge_factor" ) {
 		public void applySetting(IndexWriter writer, int value) {
-			writer.setMaxBufferedDocs( value );
+			writer.setMergeFactor( value );
 		}
 	} ,
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setRAMBufferSizeMB(int)
+	 */
 	RAM_BUFFER_SIZE( "ram_buffer_size" ) {
 		public void applySetting(IndexWriter writer, int value) {
 			writer.setRAMBufferSizeMB( value );
 		}
+	},
+	/**
+	 * @see org.apache.lucene.index.IndexWriter.setTermIndexInterval(int)
+	 */
+	TERM_INDEX_INTERVAL( "term_index_interval" ) {
+		public void applySetting(IndexWriter writer, int value) {
+			writer.setTermIndexInterval( value );
+		}
 	};
 	=

 	private final String cfgKey;
 	=

-	IndexWriterSetting(String configurationKey){
+	IndexWriterSetting(String configurationKey) {
 		this.cfgKey =3D configurationKey;
 	}
 	=

@@ -39,6 +80,9 @@
 	 */
 	public abstract void applySetting(IndexWriter writer, int value);
 =

+	/**
+	 * @return The key used in configuration files to select an option.
+	 */
 	public String getKey() {
 		return cfgKey;
 	}

Added: search/trunk/src/java/org/hibernate/search/backend/configuration/Mas=
kedProperty.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	                        (rev 0)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -0,0 +1,345 @@
+package org.hibernate.search.backend.configuration;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A wrapper to Properties, to restrict the availability of
+ * values to only those which have a key beginning with some
+ * masking String.
+ * Methods to list available keys or values or otherwise
+ * enumerate available properties are not available.
+ * =

+ * @author Sanne Grinovero
+ */
+public class MaskedProperty extends Properties implements Serializable {
+	=

+	private static final long serialVersionUID =3D -593307257383085113L;
+	private static Logger log =3D LoggerFactory.getLogger( MaskedProperty.cla=
ss );
+	=

+	private final Properties masked;
+	private final Properties fallBack;
+	private final String radix;
+	=

+	/**
+	 * Provides a view to the provided Properties hiding
+	 * all keys not starting with some [mask.].
+	 * @param propsToMask the Properties containing the values.
+	 * @param mask
+	 */
+	public MaskedProperty(Properties propsToMask, String mask) {
+		this( propsToMask, mask, null );
+	}
+	=

+	/**
+	 * Provides a view to the provided Properties hiding
+	 * all keys not starting with some [mask.].
+	 * If no value is found then a value is returned from propsFallBack,
+	 * without masking.
+	 * @param propsToMask
+	 * @param mask
+	 * @param propsFallBack
+	 */
+	public MaskedProperty(Properties propsToMask, String mask, Properties pro=
psFallBack) {
+		if ( propsToMask=3D=3Dnull || mask=3D=3Dnull ) {
+			throw new java.lang.IllegalArgumentException();
+		}
+		this.masked =3D propsToMask;
+		this.radix =3D mask + ".";
+		this.fallBack =3D propsFallBack;
+	}
+	=

+	@Override
+	public String getProperty(String key) {
+		String compositeKey =3D radix + key;
+		String value =3D masked.getProperty( compositeKey );
+		if ( value !=3D null) {
+			log.trace( "found a match for key: [{}] value: {}", compositeKey, value=
 );
+			return value;
+		}
+		else if ( fallBack !=3D null ) {
+			return fallBack.getProperty( key );
+		}
+		else {
+			return null;
+		}
+	}
+
+	/**
+	 * @throws IllegalArgumentException if the key is not a String instance
+	 */
+	@Override
+	public boolean containsKey(Object key) {
+		if ( ! ( key instanceof String ) ) {
+			throw new IllegalArgumentException( "key must be a String" );
+		}
+		return getProperty( key.toString() ) !=3D null;
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		String val =3D getProperty( key );
+		return ( val =3D=3D null ) ? defaultValue : val;
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public void list(PrintStream out) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public void list(PrintWriter out) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void load(InputStream inStream) throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void loadFromXML(InputStream in) throws IOException,
+			InvalidPropertiesFormatException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public Enumeration<?> propertyNames() {
+		throw new UnsupportedOperationException();
+	}
+	=

+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void save(OutputStream out, String comments) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Object setProperty(String key, String value) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void store(OutputStream out, String comments)
+			throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void storeToXML(OutputStream os, String comment,
+			String encoding) throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void storeToXML(OutputStream os, String comment)
+			throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void clear() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Object clone() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized boolean contains(Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public boolean containsValue(Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Enumeration<Object> elements() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public Set<java.util.Map.Entry<Object, Object>> entrySet() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Object get(Object key) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public synchronized boolean isEmpty() {
+		if ( fallBack=3D=3Dnull ) {
+			return masked.isEmpty();
+		}
+		else {
+			return masked.isEmpty() && fallBack.isEmpty();
+		}
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Enumeration<Object> keys() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public Set<Object> keySet() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Object put(Object key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized void putAll(Map<? extends Object, ? extends Object> t=
) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	protected void rehash() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized Object remove(Object key) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public synchronized int size() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public synchronized String toString() {
+		return masked.toString();
+	}
+
+	/**
+	 * @throws UnsupportedOperationException
+	 */
+	@Override
+	public Collection<Object> values() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime =3D 31;
+		int result =3D ( ( fallBack =3D=3D null ) ? 0 : fallBack.hashCode() );
+		result =3D prime * result + masked.hashCode();
+		result =3D prime * result + radix.hashCode();
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if ( this =3D=3D obj )
+			return true;
+		if ( getClass() !=3D obj.getClass() )
+			return false;
+		final MaskedProperty other =3D (MaskedProperty) obj;
+		if ( fallBack =3D=3D null ) {
+			if ( other.fallBack !=3D null )
+				return false;
+		} else if ( ! fallBack.equals( other.fallBack ) )
+			return false;
+		if ( ! masked.equals( other.masked ) )
+			return false;
+		if ( ! radix.equals( other.radix ) )
+			return false;
+		return true;
+	}
+	=

+}

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -1,331 +1,272 @@
-//$Id$
-package org.hibernate.search.store;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.regex.Pattern;
-
-import org.hibernate.HibernateException;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
-import org.hibernate.annotations.common.reflection.XClass;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.search.SearchException;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.backend.LuceneIndexingParameters;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.impl.SearchFactoryImpl;
-import org.hibernate.search.store.optimization.IncrementalOptimizerStrateg=
y;
-import org.hibernate.search.store.optimization.NoOpOptimizerStrategy;
-import org.hibernate.search.store.optimization.OptimizerStrategy;
-import org.hibernate.util.ReflectHelper;
-import org.hibernate.util.StringHelper;
-
-/**
- * Create a Lucene directory provider
- * <p/>
- * Lucene directory providers are configured through properties
- * <ul>
- * 	<li>hibernate.search.default.* and</li>
- * 	<li>hibernate.search.&lt;indexname&gt;.*</li>
- * </ul>
- * <p/>
- * &lt;indexname&gt; properties have precedence over default
- * <p/>
- * The implementation is described by
- * hibernate.search.[default|indexname].directory_provider
- * <p/>
- * If none is defined the default value is FSDirectory
- *
- * @author Emmanuel Bernard
- * @author Sylvain Vieujot
- * @author Hardy Ferentschik
- */
-public class DirectoryProviderFactory {
-	private List<DirectoryProvider<?>> providers =3D new ArrayList<DirectoryP=
rovider<?>>();
-	private static String LUCENE_PREFIX =3D "hibernate.search.";
-	private static String LUCENE_DEFAULT =3D LUCENE_PREFIX + "default.";
-	private static String DEFAULT_DIRECTORY_PROVIDER =3D FSDirectoryProvider.=
class.getName();
-	=

-	private static final String SHARDING_STRATEGY =3D "sharding_strategy";
-	private static final String NBR_OF_SHARDS =3D SHARDING_STRATEGY + ".nbr_o=
f_shards";
-	private static Pattern dotPattern =3D Pattern.compile( "\\." );
-
-
-	public DirectoryProviders createDirectoryProviders(XClass entity, Configu=
ration cfg, SearchFactoryImplementor searchFactoryImplementor) {
-		//get properties
-		String directoryProviderName =3D getDirectoryProviderName( entity, cfg );
-		Properties[] indexProps =3D getDirectoryProperties( cfg, directoryProvid=
erName );
-
-		//set up the directories
-		int nbrOfProviders =3D indexProps.length;
-		DirectoryProvider[] providers =3D new DirectoryProvider[nbrOfProviders];
-		for (int index =3D 0 ; index < nbrOfProviders ; index++) {
-			String providerName =3D nbrOfProviders > 1 ?
-					directoryProviderName + "." + index :
-					directoryProviderName;
-			providers[index] =3D createDirectoryProvider( providerName,indexProps[i=
ndex], searchFactoryImplementor);
-		}
-
-		//define sharding strategy
-		IndexShardingStrategy shardingStrategy;
-		Properties shardingProperties =3D new Properties();
-		//we use an enumeration to get the keys from defaultProperties as well
-		Enumeration<String> allProps =3D (Enumeration<String>) indexProps[0].pro=
pertyNames();
-		while ( allProps.hasMoreElements() ){
-			String key =3D allProps.nextElement();
-			if ( key.startsWith( SHARDING_STRATEGY ) ) {
-				shardingProperties.put( key, indexProps[0].getProperty( key ) );
-			}
-		}
-
-		String shardingStrategyName =3D shardingProperties.getProperty( SHARDING=
_STRATEGY );
-		if ( shardingStrategyName =3D=3D null) {
-			if ( indexProps.length =3D=3D 1 ) {
-				shardingStrategy =3D new NotShardedStrategy();
-			}
-			else {
-				shardingStrategy =3D new IdHashShardingStrategy();
-			}
-		}
-		else {
-			try {
-				Class shardigStrategyClass =3D ReflectHelper.classForName( shardingStr=
ategyName, this.getClass() );
-				shardingStrategy =3D (IndexShardingStrategy) shardigStrategyClass.newI=
nstance();
-			}
-			catch (ClassNotFoundException e) {
-				throw new SearchException("Unable to find ShardingStrategy class " + s=
hardingStrategyName + " for " + directoryProviderName, e);
-			}
-			catch (IllegalAccessException e) {
-				throw new SearchException("Unable to create instance of ShardingStrate=
gy class " + shardingStrategyName
-						+ " Be sure to have a no-arg constructor", e);
-			}
-			catch (InstantiationException e) {
-				throw new SearchException("Unable to create instance of ShardingStrate=
gy class " + shardingStrategyName
-						+ " Be sure to have a no-arg constructor", e);
-			}
-			catch (ClassCastException e) {
-				throw new SearchException("ShardingStrategy class does not implements =
DirecotryProviderShardingStrategy: "
-						+ shardingStrategyName, e);
-			}
-		}
-		shardingStrategy.initialize( shardingProperties, providers );
-
-		return new DirectoryProviders( shardingStrategy, providers );
-	}
-
-	public void startDirectoryProviders() {
-		for ( DirectoryProvider provider : providers ) {
-			provider.start();
-		}
-	}
-
-	private DirectoryProvider<?> createDirectoryProvider(String directoryProv=
iderName, Properties indexProps, SearchFactoryImplementor searchFactoryImpl=
ementor) {
-		String className =3D indexProps.getProperty( "directory_provider" );
-		if ( StringHelper.isEmpty( className ) ) {
-			className =3D DEFAULT_DIRECTORY_PROVIDER;
-		}
-		DirectoryProvider<?> provider;
-		try {
-			@SuppressWarnings( "unchecked" )
-			Class<DirectoryProvider> directoryClass =3D ReflectHelper.classForName(
-					className, DirectoryProviderFactory.class
-			);
-			provider =3D directoryClass.newInstance();
-		}
-		catch (Exception e) {
-			throw new HibernateException( "Unable to instanciate directory provider=
: " + className, e );
-		}
-		try {
-			provider.initialize( directoryProviderName, indexProps, searchFactoryIm=
plementor );
-		}
-		catch (Exception e) {
-			throw new HibernateException( "Unable to initialize: " + directoryProvi=
derName, e);
-		}
-		int index =3D providers.indexOf( provider );
-		if ( index !=3D -1 ) {
-			//share the same Directory provider for the same underlying store
-			return providers.get( index );
-		}
-		else {
-			configureOptimizerStrategy(searchFactoryImplementor, indexProps, provid=
er);
-			configureIndexingParameters(searchFactoryImplementor, indexProps, provi=
der);
-			providers.add( provider );
-			if ( !searchFactoryImplementor.getLockableDirectoryProviders().contains=
Key( provider ) ) {
-				searchFactoryImplementor.getLockableDirectoryProviders().put( provider=
, new ReentrantLock() );
-			}
-			return provider;
-		}
-	}
-
-	private void configureOptimizerStrategy(SearchFactoryImplementor searchFa=
ctoryImplementor, Properties indexProps, DirectoryProvider<?> provider) {
-		boolean incremental =3D indexProps.containsKey( "optimizer.operation_lim=
it.max" )
-				|| indexProps.containsKey( "optimizer.transaction_limit.max" );
-		OptimizerStrategy optimizerStrategy;
-		if (incremental) {
-			optimizerStrategy =3D new IncrementalOptimizerStrategy();
-			optimizerStrategy.initialize( provider, indexProps, searchFactoryImplem=
entor);
-		}
-		else {
-			optimizerStrategy =3D new NoOpOptimizerStrategy();
-		}
-		searchFactoryImplementor.addOptimizerStrategy(provider, optimizerStrateg=
y);
-	}
-	=

-	/**
-	 * Creates a new <code>LuceneIndexingParameters</code> instance for the s=
pecified provider. =

-	 * If there are no matching properties in the configuration default value=
s will be applied.
-	 * <p>
-	 * NOTE:</br>
-	 * If a non batch value is set in the configuration apply it also to the
-     * batch mode. This covers the case where users only specify =

-	 * parameters for the non batch mode. In this case the same parameters ap=
ply for =

-	 * batch indexing.
-	 * </p>
-	 * =

-	 * @param searchFactoryImplementor the search factory.
-	 * @param indexProps The properties extracted from the configuration.
-	 * @param provider The directory provider for which to configure the inde=
xing parameters.
-	 */
-	private void configureIndexingParameters(SearchFactoryImplementor searchF=
actoryImplementor, Properties indexProps, DirectoryProvider<?> provider) {
-		LuceneIndexingParameters indexingParams =3D new LuceneIndexingParameters=
( indexProps );
-		searchFactoryImplementor.addIndexingParmeters( provider, indexingParams =
);
-	}
-
-	/**
-	 * Returns an array of directory properties
-	 * Properties are defaulted. For a given property name,
-	 * hibernate.search.indexname.n has priority over hibernate.search.indexn=
ame which has priority over hibernate.search
-	 * If the Index is not sharded, a single Properties is returned
-	 * If the index is sharded, the Properties index matches the shard index
-	 */	=

-	private static Properties[] getDirectoryProperties(Configuration cfg, Str=
ing directoryProviderName) {
-
-		Properties cfgAndImplicitProperties =3D new Properties();
-		// cfg has no defaults, so we may use keySet iteration
-		//FIXME not so sure about that cfg.setProperties()?
-		for ( Map.Entry entry : cfg.getProperties().entrySet() ) {
-			String key =3D entry.getKey().toString();// casting to String
-			if ( key.startsWith( LUCENE_PREFIX ) ) {
-				//put regular properties and add an explicit batch property when a tra=
nsaction property is set
-				cfgAndImplicitProperties.put( key, entry.getValue() );
-				//be careful to replace only the intended ".transaction." with ".batch=
.":
-				String[] splitKey =3D dotPattern.split( key );
-				//TODO this code is vulnerable to properties with dot in the name. Thi=
s is not a problem today though
-				if ( splitKey.length > 2 && splitKey[ splitKey.length - 2 ]
-				                                      .equals( LuceneIndexingParameter=
s.TRANSACTION ) ) {
-					splitKey[ splitKey.length - 2 ] =3D LuceneIndexingParameters.BATCH;
-					StringBuilder missingKeyBuilder =3D new StringBuilder( splitKey[0] );
-					for (int i =3D 1; i < splitKey.length; i++) {
-						missingKeyBuilder.append( "." );
-						missingKeyBuilder.append( splitKey[i] );
-					}
-					String additionalKey =3D missingKeyBuilder.toString();
-					if ( cfg.getProperty(additionalKey) =3D=3D null ){
-						cfgAndImplicitProperties.put(additionalKey, cfg.getProperty(key) );
-					}
-				}
-			}
-		}
-		Properties globalProperties =3D new Properties();
-		Properties directoryLocalProperties =3D new Properties( globalProperties=
 );
-		String directoryLocalPrefix =3D LUCENE_PREFIX + directoryProviderName + =
".";
-		for ( Map.Entry entry : cfgAndImplicitProperties.entrySet() ) {
-			String key =3D entry.getKey().toString();// casting to String
-			if ( key.startsWith( LUCENE_DEFAULT ) ) {
-				globalProperties.put( key.substring( LUCENE_DEFAULT.length() ), entry.=
getValue() );
-			}
-			else if ( key.startsWith( directoryLocalPrefix ) ) {
-				directoryLocalProperties.put( key.substring( directoryLocalPrefix.leng=
th() ),entry.getValue() );
-			}
-		}
-		final String shardsCountValue =3D directoryLocalProperties.getProperty(N=
BR_OF_SHARDS);
-		if (shardsCountValue =3D=3D null) {
-			// no shards: finished.
-			return new Properties[] { directoryLocalProperties };
-		} else {
-			// count shards
-			int shardsCount =3D -1;
-			{
-				try {
-					shardsCount =3D Integer.parseInt( shardsCountValue );
-				} catch (NumberFormatException e) {
-					if ( cfgAndImplicitProperties.getProperty(directoryLocalPrefix + NBR_=
OF_SHARDS ) !=3D null)
-						throw new SearchException( shardsCountValue + " is not a number", e);
-				}
-			}
-			// create shard-specific Props
-			Properties[] shardLocalProperties =3D new Properties[shardsCount];
-			for ( int i =3D 0; i < shardsCount; i++ ) {
-				String currentShardPrefix =3D i + ".";
-				Properties currentProp =3D new Properties( directoryLocalProperties );
-				//Enumerations are ugly but otherwise we can't get the property defaul=
ts:
-				Enumeration<String> localProps =3D (Enumeration<String>) directoryLoca=
lProperties.propertyNames();
-				while ( localProps.hasMoreElements() ){
-					String key =3D localProps.nextElement();
-					if ( key.startsWith( currentShardPrefix ) ) {
-						currentProp.setProperty( key.substring( currentShardPrefix.length() =
), directoryLocalProperties.getProperty( key ) );
-					}
-				}
-				shardLocalProperties[i] =3D currentProp;
-			}
-			return shardLocalProperties;
-		}
-	}
-
-	private static String getDirectoryProviderName(XClass clazz, Configuratio=
n cfg) {
-		//yuk
-		ReflectionManager reflectionManager =3D SearchFactoryImpl.getReflectionM=
anager(cfg);
-		//get the most specialized (ie subclass > superclass) non default index =
name
-		//if none extract the name from the most generic (superclass > subclass)=
 @Indexed class in the hierarchy
-		//FIXME I'm inclined to get rid of the default value
-		PersistentClass pc =3D cfg.getClassMapping( clazz.getName() );
-		XClass rootIndex =3D null;
-		do {
-			XClass currentClazz =3D reflectionManager.toXClass( pc.getMappedClass()=
 );
-			Indexed indexAnn =3D currentClazz.getAnnotation( Indexed.class );
-			if ( indexAnn !=3D null ) {
-				if ( indexAnn.index().length() !=3D 0 ) {
-					return indexAnn.index();
-				}
-				else {
-					rootIndex =3D currentClazz;
-				}
-			}
-			pc =3D pc.getSuperclass();
-		}
-		while ( pc !=3D null );
-		//there is nobody out there with a non default @Indexed.index
-		if ( rootIndex !=3D null ) {
-			return rootIndex.getName();
-		}
-		else {
-			throw new HibernateException(
-					"Trying to extract the index name from a non @Indexed class: " + claz=
z.getName() );
-		}
-	}
-
-	public class DirectoryProviders {
-		private IndexShardingStrategy shardingStrategy;
-		private DirectoryProvider[] providers;
-
-
-		public DirectoryProviders(IndexShardingStrategy shardingStrategy, Direct=
oryProvider[] providers) {
-			this.shardingStrategy =3D shardingStrategy;
-			this.providers =3D providers;
-		}
-
-
-		public IndexShardingStrategy getSelectionStrategy() {
-			return shardingStrategy;
-		}
-
-		public DirectoryProvider[] getProviders() {
-			return providers;
-		}
-	}
-}
+//$Id$
+package org.hibernate.search.store;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.backend.LuceneIndexingParameters;
+import org.hibernate.search.backend.configuration.MaskedProperty;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.impl.SearchFactoryImpl;
+import org.hibernate.search.store.optimization.IncrementalOptimizerStrateg=
y;
+import org.hibernate.search.store.optimization.NoOpOptimizerStrategy;
+import org.hibernate.search.store.optimization.OptimizerStrategy;
+import org.hibernate.util.ReflectHelper;
+import org.hibernate.util.StringHelper;
+
+/**
+ * Create a Lucene directory provider
+ * <p/>
+ * Lucene directory providers are configured through properties
+ * <ul>
+ * 	<li>hibernate.search.default.* and</li>
+ * 	<li>hibernate.search.&lt;indexname&gt;.*</li>
+ * </ul>
+ * <p/>
+ * &lt;indexname&gt; properties have precedence over default
+ * <p/>
+ * The implementation is described by
+ * hibernate.search.[default|indexname].directory_provider
+ * <p/>
+ * If none is defined the default value is FSDirectory
+ *
+ * @author Emmanuel Bernard
+ * @author Sylvain Vieujot
+ * @author Hardy Ferentschik
+ * @author Sanne Grinovero
+ */
+public class DirectoryProviderFactory {
+	=

+	private List<DirectoryProvider<?>> providers =3D new ArrayList<DirectoryP=
rovider<?>>();
+	private static String DEFAULT_DIRECTORY_PROVIDER =3D FSDirectoryProvider.=
class.getName();
+	=

+	private static final String SHARDING_STRATEGY =3D "sharding_strategy";
+	private static final String NBR_OF_SHARDS =3D SHARDING_STRATEGY + ".nbr_o=
f_shards";
+
+	public DirectoryProviders createDirectoryProviders(XClass entity, Configu=
ration cfg, SearchFactoryImplementor searchFactoryImplementor) {
+		//get properties
+		String directoryProviderName =3D getDirectoryProviderName( entity, cfg );
+		Properties[] indexProps =3D getDirectoryProperties( cfg, directoryProvid=
erName );
+
+		//set up the directories
+		int nbrOfProviders =3D indexProps.length;
+		DirectoryProvider[] providers =3D new DirectoryProvider[nbrOfProviders];
+		for ( int index =3D 0 ; index < nbrOfProviders ; index++ ) {
+			String providerName =3D nbrOfProviders > 1 ?
+					directoryProviderName + "." + index :
+					directoryProviderName;
+			providers[index] =3D createDirectoryProvider( providerName, indexProps[=
index], searchFactoryImplementor );
+		}
+
+		//define sharding strategy
+		IndexShardingStrategy shardingStrategy;
+		//any indexProperty will do, the indexProps[0] surely exists.
+		String shardingStrategyName =3D indexProps[0].getProperty( SHARDING_STRA=
TEGY );
+		if ( shardingStrategyName =3D=3D null) {
+			if ( indexProps.length =3D=3D 1 ) {
+				shardingStrategy =3D new NotShardedStrategy();
+			}
+			else {
+				shardingStrategy =3D new IdHashShardingStrategy();
+			}
+		}
+		else {
+			try {
+				Class shardigStrategyClass =3D ReflectHelper.classForName( shardingStr=
ategyName, this.getClass() );
+				shardingStrategy =3D (IndexShardingStrategy) shardigStrategyClass.newI=
nstance();
+			}
+			catch (ClassNotFoundException e) {
+				throw new SearchException("Unable to find ShardingStrategy class " + s=
hardingStrategyName + " for " + directoryProviderName, e);
+			}
+			catch (IllegalAccessException e) {
+				throw new SearchException("Unable to create instance of ShardingStrate=
gy class " + shardingStrategyName
+						+ " Be sure to have a no-arg constructor", e);
+			}
+			catch (InstantiationException e) {
+				throw new SearchException("Unable to create instance of ShardingStrate=
gy class " + shardingStrategyName
+						+ " Be sure to have a no-arg constructor", e);
+			}
+			catch (ClassCastException e) {
+				throw new SearchException("ShardingStrategy class does not implements =
DirecotryProviderShardingStrategy: "
+						+ shardingStrategyName, e);
+			}
+		}
+		shardingStrategy.initialize(
+				new MaskedProperty( indexProps[0], SHARDING_STRATEGY ), providers );
+		return new DirectoryProviders( shardingStrategy, providers );
+	}
+
+	public void startDirectoryProviders() {
+		for ( DirectoryProvider provider : providers ) {
+			provider.start();
+		}
+	}
+
+	private DirectoryProvider<?> createDirectoryProvider(String directoryProv=
iderName, Properties indexProps, SearchFactoryImplementor searchFactoryImpl=
ementor) {
+		String className =3D indexProps.getProperty( "directory_provider" );
+		if ( StringHelper.isEmpty( className ) ) {
+			className =3D DEFAULT_DIRECTORY_PROVIDER;
+		}
+		DirectoryProvider<?> provider;
+		try {
+			@SuppressWarnings( "unchecked" )
+			Class<DirectoryProvider> directoryClass =3D ReflectHelper.classForName(
+					className, DirectoryProviderFactory.class
+			);
+			provider =3D directoryClass.newInstance();
+		}
+		catch (Exception e) {
+			throw new SearchException( "Unable to instantiate directory provider: "=
 + className, e );
+		}
+		try {
+			provider.initialize( directoryProviderName, indexProps, searchFactoryIm=
plementor );
+		}
+		catch (Exception e) {
+			throw new SearchException( "Unable to initialize: " + directoryProvider=
Name, e );
+		}
+		int index =3D providers.indexOf( provider );
+		if ( index !=3D -1 ) {
+			//share the same Directory provider for the same underlying store
+			return providers.get( index );
+		}
+		else {
+			configureOptimizerStrategy( searchFactoryImplementor, indexProps, provi=
der );
+			configureIndexingParameters( searchFactoryImplementor, indexProps, prov=
ider );
+			providers.add( provider );
+			if ( !searchFactoryImplementor.getLockableDirectoryProviders().contains=
Key( provider ) ) {
+				searchFactoryImplementor.getLockableDirectoryProviders().put( provider=
, new ReentrantLock() );
+			}
+			return provider;
+		}
+	}
+
+	private void configureOptimizerStrategy(SearchFactoryImplementor searchFa=
ctoryImplementor, Properties indexProps, DirectoryProvider<?> provider) {
+		boolean incremental =3D indexProps.containsKey( "optimizer.operation_lim=
it.max" )
+				|| indexProps.containsKey( "optimizer.transaction_limit.max" );
+		OptimizerStrategy optimizerStrategy;
+		if (incremental) {
+			optimizerStrategy =3D new IncrementalOptimizerStrategy();
+			optimizerStrategy.initialize( provider, indexProps, searchFactoryImplem=
entor );
+		}
+		else {
+			optimizerStrategy =3D new NoOpOptimizerStrategy();
+		}
+		searchFactoryImplementor.addOptimizerStrategy( provider, optimizerStrate=
gy );
+	}
+	=

+	/**
+	 * Creates a new <code>LuceneIndexingParameters</code> instance for the s=
pecified provider. =

+	 * If there are no matching properties in the configuration default value=
s will be applied.
+	 * <p>
+	 * NOTE:</br>
+	 * If a non batch value is set in the configuration apply it also to the
+     * batch mode. This covers the case where users only specify =

+	 * parameters for the non batch mode. In this case the same parameters ap=
ply for =

+	 * batch indexing. Parameters are found "depth-first": if a batch paramet=
er is set
+	 * in a global scope it will take priority on local transaction parameter=
s.
+	 * </p>
+	 * =

+	 * @param searchFactoryImplementor the search factory.
+	 * @param directoryProperties The properties extracted from the configura=
tion.
+	 * @param provider The directory provider for which to configure the inde=
xing parameters.
+	 */
+	private void configureIndexingParameters(SearchFactoryImplementor searchF=
actoryImplementor,
+			Properties directoryProperties, DirectoryProvider<?> provider) {
+		LuceneIndexingParameters indexingParams =3D new LuceneIndexingParameters=
( directoryProperties );
+		searchFactoryImplementor.addIndexingParmeters( provider, indexingParams =
);
+	}
+
+	/**
+	 * Returns an array of directory properties
+	 * Properties are defaulted. For a given property name,
+	 * hibernate.search.indexname.n has priority over hibernate.search.indexn=
ame which has priority over hibernate.search.default
+	 * If the Index is not sharded, a single Properties is returned
+	 * If the index is sharded, the Properties index matches the shard index
+	 */	=

+	private static Properties[] getDirectoryProperties(Configuration cfg, Str=
ing directoryProviderName) {
+		Properties rootCfg =3D new MaskedProperty( cfg.getProperties(), "hiberna=
te.search" );
+		Properties globalProperties =3D new MaskedProperty( rootCfg, "default" );
+		Properties directoryLocalProperties =3D new MaskedProperty( rootCfg, dir=
ectoryProviderName, globalProperties );
+		final String shardsCountValue =3D directoryLocalProperties.getProperty( =
NBR_OF_SHARDS );
+		if ( shardsCountValue =3D=3D null ) {
+			// no shards: finished.
+			return new Properties[] { directoryLocalProperties };
+		} else {
+			// count shards
+			int shardsCount;
+			{
+				try {
+					shardsCount =3D Integer.parseInt( shardsCountValue );
+				} catch (NumberFormatException e) {
+						throw new SearchException( shardsCountValue + " is not a number", e);
+				}
+			}
+			// create shard-specific Props
+			Properties[] shardLocalProperties =3D new Properties[shardsCount];
+			for ( int i =3D 0; i < shardsCount; i++ ) {
+				shardLocalProperties[i] =3D new MaskedProperty(
+						directoryLocalProperties, Integer.toString(i), directoryLocalPropert=
ies );
+			}
+			return shardLocalProperties;
+		}
+	}
+
+	private static String getDirectoryProviderName(XClass clazz, Configuratio=
n cfg) {
+		//yuk
+		ReflectionManager reflectionManager =3D SearchFactoryImpl.getReflectionM=
anager(cfg);
+		//get the most specialized (ie subclass > superclass) non default index =
name
+		//if none extract the name from the most generic (superclass > subclass)=
 @Indexed class in the hierarchy
+		//FIXME I'm inclined to get rid of the default value
+		PersistentClass pc =3D cfg.getClassMapping( clazz.getName() );
+		XClass rootIndex =3D null;
+		do {
+			XClass currentClazz =3D reflectionManager.toXClass( pc.getMappedClass()=
 );
+			Indexed indexAnn =3D currentClazz.getAnnotation( Indexed.class );
+			if ( indexAnn !=3D null ) {
+				if ( indexAnn.index().length() !=3D 0 ) {
+					return indexAnn.index();
+				}
+				else {
+					rootIndex =3D currentClazz;
+				}
+			}
+			pc =3D pc.getSuperclass();
+		}
+		while ( pc !=3D null );
+		//there is nobody out there with a non default @Indexed.index
+		if ( rootIndex !=3D null ) {
+			return rootIndex.getName();
+		}
+		else {
+			throw new SearchException(
+					"Trying to extract the index name from a non @Indexed class: " + claz=
z.getName() );
+		}
+	}
+
+	public class DirectoryProviders {
+		private IndexShardingStrategy shardingStrategy;
+		private DirectoryProvider[] providers;
+
+		public DirectoryProviders(IndexShardingStrategy shardingStrategy, Direct=
oryProvider[] providers) {
+			this.shardingStrategy =3D shardingStrategy;
+			this.providers =3D providers;
+		}
+
+		public IndexShardingStrategy getSelectionStrategy() {
+			return shardingStrategy;
+		}
+
+		public DirectoryProvider[] getProviders() {
+			return providers;
+		}
+	}
+
+}

Modified: search/trunk/src/test/org/hibernate/search/test/configuration/Con=
figurationReadTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/configuration/Configura=
tionReadTestCase.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/Configura=
tionReadTestCase.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -8,6 +8,7 @@
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.impl.SearchFactoryImpl;
 import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.util.FileHelper;
 =

 /**
  * Contains some utility methods to simplify coding of
@@ -17,7 +18,7 @@
  */
 public abstract class ConfigurationReadTestCase extends SearchTestCase {
 	=

-	private static final File INDEX_DIR =3D new File( new File("."), "indexte=
mp" );
+	private static final File INDEX_DIR =3D new File( new File( "." ), "index=
temp" );
 =

 	private SearchFactoryImplementor searchFactory;
 =

@@ -31,7 +32,7 @@
 		FullTextSession fullTextSession =3D Search.createFullTextSession( openSe=
ssion() );
 		searchFactory =3D (SearchFactoryImpl) fullTextSession.getSearchFactory();
 		fullTextSession.close();
-		remove(INDEX_DIR);
+		FileHelper.delete( INDEX_DIR );
 		INDEX_DIR.mkdirs();
 	}
 =

@@ -83,19 +84,7 @@
 	=

 	protected void tearDown() throws Exception {
 		super.tearDown();
-		remove(INDEX_DIR);
+		FileHelper.delete( INDEX_DIR );
 	}
-	=

-	private void remove(File indexDir) {
-		if (indexDir.exists()) {
-			File[] containing =3D indexDir.listFiles();
-			if ( containing !=3D null ) { //is a directory
-				for (int i=3D0; i<containing.length; i++ ){
-					remove(containing[i]);
-				}
-			}
-			indexDir.delete();
-		}
-	}
 =

 }

Modified: search/trunk/src/test/org/hibernate/search/test/configuration/Luc=
eneIndexingParametersTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/configuration/LuceneInd=
exingParametersTest.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/LuceneInd=
exingParametersTest.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -28,9 +28,10 @@
 		=

 		cfg.setProperty( "hibernate.search.Book.batch.max_merge_docs", "12" );
 		cfg.setProperty( "hibernate.search.Book.batch.merge_factor", "13" );
-		cfg.setProperty( "hibernate.search.Book.batch.max_buffered_docs", "14" );
+		// new keyword "indexwriter" is also supported to group parameters:
+		cfg.setProperty( "hibernate.search.Book.indexwriter.batch.max_buffered_d=
ocs", "14" );
 		=

-		cfg.setProperty( "hibernate.search.Book.transaction.ram_buffer_size", "4=
" );
+		cfg.setProperty( "hibernate.search.Book.indexwriter.transaction.ram_buff=
er_size", "4" );
 		cfg.setProperty( "hibernate.search.Book.transaction.max_merge_docs", "15=
" );
 		cfg.setProperty( "hibernate.search.Book.transaction.merge_factor", "16" =
);
 		cfg.setProperty( "hibernate.search.Book.transaction.max_buffered_docs", =
"17" );
@@ -59,7 +60,7 @@
 	=

 	public void testUnsetBatchValueTakesTransaction() throws Exception {
 		assertValueIsSet( Document.class, BATCH, MERGE_FACTOR, 6 );
-		assertValueIsSet( Document.class, BATCH, MAX_BUFFERED_DOCS, 7 );
+		assertValueIsSet( Document.class, BATCH, MAX_BUFFERED_DOCS, 1000 );
 	}
 	=

 	public void testExplicitBatchParameters() throws Exception {
@@ -69,7 +70,7 @@
 	}
 	=

 	public void testInheritedBatchParametersFromTranscation() throws Exceptio=
n {
-		assertValueIsSet( Book.class, BATCH, RAM_BUFFER_SIZE, 4 );
+		assertValueIsSet( Book.class, BATCH, RAM_BUFFER_SIZE, 1 );
 	}
 	=

 	public void testTransactionParameters() throws Exception {

Added: search/trunk/src/test/org/hibernate/search/test/configuration/Masked=
PropertiesTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/configuration/MaskedPro=
pertiesTest.java	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/MaskedPro=
pertiesTest.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -0,0 +1,40 @@
+package org.hibernate.search.test.configuration;
+
+import java.util.Properties;
+
+import org.hibernate.search.backend.configuration.MaskedProperty;
+
+/**
+ * @author Sanne Grinovero
+ */
+public class MaskedPropertiesTest extends junit.framework.TestCase {
+
+	public void testConfigurationParsingPrecedence() {
+		Properties cfg =3D new Properties();
+		cfg.put( "hibernate.search.Animals.transaction.indexwriter.max_merge_doc=
s", "1" );
+		cfg.put( "hibernate.search.Animals.2.transaction.indexwriter.max_merge_d=
ocs", "2" );
+		cfg.put( "hibernate.search.Animals.2.transaction.max_merge_docs", "3" );
+		cfg.put( "hibernate.search.Animals.transaction.max_merge_docs", "5" );
+		cfg.put( "hibernate.search.default.transaction.max_merge_docs", "6" );
+		cfg.put( "hibernate.search.default.transaction.indexwriter.max_field_len=
gth", "7" );
+
+		//this is more a "concept demo" than a test:
+		Properties root =3D new MaskedProperty( cfg, "hibernate.search" );
+		//only keys starting as "hibernate.search.default" are exposed:
+		Properties common =3D new MaskedProperty( root, "default" );
+		//now as "hibernate.search.Animals" or "hibernate.search.default" if fir=
st fails:
+		Properties dirProvider =3D new MaskedProperty( root, "Animals", common );
+		//this narrows visibility to "hibernate.search.<providername|default>.tr=
ansaction":
+		Properties transaction =3D new MaskedProperty( dirProvider, "transaction=
" );
+		Properties shard2 =3D new MaskedProperty( dirProvider, "2", dirProvider =
);
+		Properties transactionInShard2 =3D new MaskedProperty( shard2, "transact=
ion", transaction );
+		Properties newStyleTransaction =3D new MaskedProperty( transaction, "ind=
exwriter", transaction );
+		Properties newStyleTransactionInShard2 =3D new MaskedProperty(
+				transactionInShard2, "indexwriter", transactionInShard2 );
+		=

+		assertEquals( "7" , newStyleTransaction.getProperty( "max_field_length" =
) );
+		assertEquals( "7" , newStyleTransactionInShard2.getProperty( "max_field_=
length" ) );
+		assertEquals( "5" , transaction.getProperty( "max_merge_docs" ) );
+	}
+	=

+}

Modified: search/trunk/src/test/org/hibernate/search/test/configuration/Sha=
rdsConfigurationTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/configuration/ShardsCon=
figurationTest.java	2008-05-23 21:42:40 UTC (rev 14689)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/ShardsCon=
figurationTest.java	2008-05-26 23:04:52 UTC (rev 14690)
@@ -4,6 +4,7 @@
 import static org.hibernate.search.backend.configuration.IndexWriterSettin=
g.MAX_MERGE_DOCS;
 import static org.hibernate.search.backend.configuration.IndexWriterSettin=
g.MERGE_FACTOR;
 import static org.hibernate.search.backend.configuration.IndexWriterSettin=
g.RAM_BUFFER_SIZE;
+import static org.hibernate.search.backend.configuration.IndexWriterSettin=
g.TERM_INDEX_INTERVAL;
 import static org.hibernate.search.test.configuration.ConfigurationReadTes=
tCase.TransactionType.TRANSACTION;
 import static org.hibernate.search.test.configuration.ConfigurationReadTes=
tCase.TransactionType.BATCH;
 import org.hibernate.search.store.DirectoryProvider;
@@ -37,32 +38,36 @@
 		cfg.setProperty( "hibernate.search.Documents.0.transaction.max_buffered_=
docs", "58" );
 		cfg.setProperty( "hibernate.search.Documents.1.batch.max_merge_docs", "1=
1" );
 		cfg.setProperty( "hibernate.search.Documents.1.transaction.max_buffered_=
docs", "12" );
+		cfg.setProperty( "hibernate.search.Documents.1.transaction.term_index_in=
terval", "12" );
 	}
 	=

 	public void testCorrectNumberOfShardsDetected() throws Exception {
-		DirectoryProvider[] docDirProviders =3D getSearchFactory().getDirectoryP=
roviders(Document.class);
-		assertNotNull(docDirProviders);
-		assertEquals(4, docDirProviders.length);
-		DirectoryProvider[] bookDirProviders =3D getSearchFactory().getDirectory=
Providers(Book.class);
-		assertNotNull(bookDirProviders);
-		assertEquals(2, bookDirProviders.length);
+		DirectoryProvider[] docDirProviders =3D getSearchFactory()
+			.getDirectoryProviders( Document.class );
+		assertNotNull( docDirProviders);
+		assertEquals( 4, docDirProviders.length );
+		DirectoryProvider[] bookDirProviders =3D getSearchFactory()
+			.getDirectoryProviders( Book.class );
+		assertNotNull( bookDirProviders );
+		assertEquals( 2, bookDirProviders.length );
 	}
 	=

 	public void testSelectionOfShardingStrategy() throws Exception {
-		IndexShardingStrategy shardingStrategy =3D getSearchFactory().getDocumen=
tBuilders().get(Document.class).getDirectoryProviderSelectionStrategy();
+		IndexShardingStrategy shardingStrategy =3D getSearchFactory().getDocumen=
tBuilders()
+			.get( Document.class ).getDirectoryProviderSelectionStrategy();
 		assertNotNull( shardingStrategy );
 		assertEquals( shardingStrategy.getClass(), UselessShardingStrategy.class=
 );
 	}
 	=

 	public void testShardingSettingsInherited() throws Exception {
-		DirectoryProvider[] docDirProviders =3D getSearchFactory().getDirectoryP=
roviders(Document.class);
+		DirectoryProvider[] docDirProviders =3D getSearchFactory().getDirectoryP=
roviders( Document.class );
 		assertTrue( docDirProviders[0] instanceof RAMDirectoryProvider );
 		assertTrue( docDirProviders[1] instanceof FSDirectoryProvider );
 		assertTrue( docDirProviders[2] instanceof RAMDirectoryProvider );
 	}
 	=

 	public void testShardN2UsesDefaults() throws Exception {
-		assertValueIsSet( Document.class, 2, TRANSACTION, MAX_BUFFERED_DOCS, 6);
+		assertValueIsSet( Document.class, 2, TRANSACTION, MAX_BUFFERED_DOCS, 6 );
 		assertValueIsDefault( Document.class, 2, TRANSACTION, MAX_MERGE_DOCS );
 		assertValueIsSet( Document.class, 2, TRANSACTION, MERGE_FACTOR, 100 );
 		assertValueIsDefault( Document.class, 2, TRANSACTION, RAM_BUFFER_SIZE );
@@ -78,8 +83,8 @@
 	}
 	=

 	public void testShard_BatchInheritedFromTransaction() throws Exception {
-		assertValueIsSet( Document.class, 1, BATCH, MAX_BUFFERED_DOCS, 12 );
-		assertValueIsSet( Document.class, 0, BATCH, MAX_BUFFERED_DOCS, 58 );
+		assertValueIsSet( Document.class, 1, BATCH, TERM_INDEX_INTERVAL, 12 );
+		assertValueIsSet( Document.class, 0, BATCH, MAX_BUFFERED_DOCS, 4 );
 	}
 	=

 	protected Class[] getMappings() {


--===============2339719175907478782==--

From hibernate-commits at lists.jboss.org Tue May 27 10:48:52 2008
Content-Type: multipart/mixed; boundary="===============8579021089836536623=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14691 -
 core/trunk/core/src/main/java/org/hibernate/context.
Date: Tue, 27 May 2008 10:48:51 -0400
Message-ID: <E1K10Tr-0007l6-Uj@committer01.frg.pub.inap.atl.jboss.com>

--===============8579021089836536623==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: steve.ebersole(a)jboss.com
Date: 2008-05-27 10:48:51 -0400 (Tue, 27 May 2008)
New Revision: 14691

Modified:
   core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.ja=
va
Log:
HHH-1786 : current session cleanup synch hack for WebSphere.

Modified: core/trunk/core/src/main/java/org/hibernate/context/JTASessionCon=
text.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.j=
ava	2008-05-26 23:04:52 UTC (rev 14690)
+++ core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.j=
ava	2008-05-27 14:48:51 UTC (rev 14691)
@@ -118,7 +118,10 @@
 				throw new HibernateException( "Unable to register cleanup Synchronizat=
ion with TransactionManager" );
 			}
 =

-			currentSessionMap.put( txn, currentSession );
+			Object txnIdentifier =3D factory.getSettings().getTransactionManagerLoo=
kup() =3D=3D null
+					? txn
+					: factory.getSettings().getTransactionManagerLookup().getTransactionI=
dentifier( txn );
+			currentSessionMap.put( txnIdentifier, currentSession );
 		}
 =

 		return currentSession;


--===============8579021089836536623==--

From hibernate-commits at lists.jboss.org Tue May 27 13:43:31 2008
Content-Type: multipart/mixed; boundary="===============8615141597397240512=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14692 - in search/trunk/src:
 java/org/hibernate/search/engine and 3 other directories.
Date: Tue, 27 May 2008 13:43:30 -0400
Message-ID: <E1K13Cs-00062q-3F@committer01.frg.pub.inap.atl.jboss.com>

--===============8615141597397240512==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-27 13:43:29 -0400 (Tue, 27 May 2008)
New Revision: 14692

Modified:
   search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedP=
roperty.java
   search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplement=
or.java
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactor=
y.java
   search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBrid=
ge.java
Log:
typo in SearchFactoryImplementor interface; some trivial code cleanups.

Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/=
MaskedProperty.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	2008-05-27 17:43:29 UTC (rev 14692)
@@ -115,7 +115,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void load(InputStream inStream) throws IOException {
+	public void load(InputStream inStream) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -123,7 +123,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void loadFromXML(InputStream in) throws IOException,
+	public void loadFromXML(InputStream in) throws IOException,
 			InvalidPropertiesFormatException {
 		throw new UnsupportedOperationException();
 	}
@@ -140,7 +140,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void save(OutputStream out, String comments) {
+	public void save(OutputStream out, String comments) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -148,7 +148,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Object setProperty(String key, String value) {
+	public Object setProperty(String key, String value) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -156,7 +156,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void store(OutputStream out, String comments)
+	public void store(OutputStream out, String comments)
 			throws IOException {
 		throw new UnsupportedOperationException();
 	}
@@ -165,7 +165,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void storeToXML(OutputStream os, String comment,
+	public void storeToXML(OutputStream os, String comment,
 			String encoding) throws IOException {
 		throw new UnsupportedOperationException();
 	}
@@ -174,7 +174,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void storeToXML(OutputStream os, String comment)
+	public void storeToXML(OutputStream os, String comment)
 			throws IOException {
 		throw new UnsupportedOperationException();
 	}
@@ -183,7 +183,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void clear() {
+	public void clear() {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -191,7 +191,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Object clone() {
+	public Object clone() {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -199,7 +199,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized boolean contains(Object value) {
+	public boolean contains(Object value) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -215,7 +215,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Enumeration<Object> elements() {
+	public Enumeration<Object> elements() {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -231,12 +231,12 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Object get(Object key) {
+	public Object get(Object key) {
 		throw new UnsupportedOperationException();
 	}
 =

 	@Override
-	public synchronized boolean isEmpty() {
+	public boolean isEmpty() {
 		if ( fallBack=3D=3Dnull ) {
 			return masked.isEmpty();
 		}
@@ -249,7 +249,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Enumeration<Object> keys() {
+	public Enumeration<Object> keys() {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -265,7 +265,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Object put(Object key, Object value) {
+	public Object put(Object key, Object value) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -273,7 +273,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized void putAll(Map<? extends Object, ? extends Object> t=
) {
+	public void putAll(Map<? extends Object, ? extends Object> t) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -289,7 +289,7 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized Object remove(Object key) {
+	public Object remove(Object key) {
 		throw new UnsupportedOperationException();
 	}
 =

@@ -297,12 +297,12 @@
 	 * @throws UnsupportedOperationException
 	 */
 	@Override
-	public synchronized int size() {
+	public int size() {
 		throw new UnsupportedOperationException();
 	}
 =

 	@Override
-	public synchronized String toString() {
+	public String toString() {
 		return masked.toString();
 	}
 =

@@ -327,6 +327,8 @@
 	public boolean equals(Object obj) {
 		if ( this =3D=3D obj )
 			return true;
+		if ( obj =3D=3D null )
+			return false;
 		if ( getClass() !=3D obj.getClass() )
 			return false;
 		final MaskedProperty other =3D (MaskedProperty) obj;

Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryIm=
plementor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-27 17:43:29 UTC (rev 14692)
@@ -39,8 +39,7 @@
 =

 	public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?=
> provider);
 =

-	//FIXME spelling error in method name:
-	void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingPa=
rameters indexingParams);
+	void addIndexingParameters(DirectoryProvider<?> provider, LuceneIndexingP=
arameters indexingParams);
 =

 	public String getIndexingStrategy();
 =


Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-27 17:43:29 UTC (rev 14692)
@@ -230,7 +230,7 @@
 		dirProviderOptimizerStrategies.put( provider, optimizerStrategy );
 	}
 =

-	public void addIndexingParmeters(DirectoryProvider<?> provider, LuceneInd=
exingParameters indexingParams) {
+	public void addIndexingParameters(DirectoryProvider<?> provider, LuceneIn=
dexingParameters indexingParams) {
 		dirProviderIndexingParams.put( provider, indexingParams );
 	}
 =


Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-27 17:43:29 UTC (rev 14692)
@@ -181,7 +181,7 @@
 	private void configureIndexingParameters(SearchFactoryImplementor searchF=
actoryImplementor,
 			Properties directoryProperties, DirectoryProvider<?> provider) {
 		LuceneIndexingParameters indexingParams =3D new LuceneIndexingParameters=
( directoryProperties );
-		searchFactoryImplementor.addIndexingParmeters( provider, indexingParams =
);
+		searchFactoryImplementor.addIndexingParameters( provider, indexingParams=
 );
 	}
 =

 	/**

Modified: search/trunk/src/test/org/hibernate/search/test/bridge/PaddedInte=
gerBridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBri=
dge.java	2008-05-27 14:48:51 UTC (rev 14691)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/PaddedIntegerBri=
dge.java	2008-05-27 17:43:29 UTC (rev 14692)
@@ -1,15 +1,10 @@
 //$Id$
 package org.hibernate.search.test.bridge;
 =

-import java.util.Arrays;
 import java.util.Map;
-import java.util.HashMap;
 =

-import org.hibernate.search.bridge.StringBridge;
 import org.hibernate.search.bridge.ParameterizedBridge;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.annotations.Parameter;
 =

 /**
  * Padding Integer bridge.
@@ -19,7 +14,7 @@
  */
 public class PaddedIntegerBridge implements TwoWayStringBridge, Parameteri=
zedBridge {
 =

-	public static String PADDING_PROPERTY =3D "padding";
+	public static final String PADDING_PROPERTY =3D "padding";
 =

 	private int padding =3D 5; //default
 =



--===============8615141597397240512==--

From hibernate-commits at lists.jboss.org Tue May 27 14:37:23 2008
Content-Type: multipart/mixed; boundary="===============8483392518556092278=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14693 - in
 commons-annotations/trunk: ivy and 3 other directories.
Date: Tue, 27 May 2008 14:37:22 -0400
Message-ID: <E1K1430-0001uC-Of@committer01.frg.pub.inap.atl.jboss.com>

--===============8483392518556092278==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 14:37:22 -0400 (Tue, 27 May 2008)
New Revision: 14693

Added:
   commons-annotations/trunk/src/java/org/hibernate/annotations/common/Vers=
ion.java
Modified:
   commons-annotations/trunk/changelog.txt
   commons-annotations/trunk/ivy/ivyconf.xml
   commons-annotations/trunk/lib/README.txt
   commons-annotations/trunk/readme.txt
   commons-annotations/trunk/src/java/org/hibernate/annotations/common/refl=
ection/java/JavaReflectionManager.java
Log:
Release

Modified: commons-annotations/trunk/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/changelog.txt	2008-05-27 17:43:29 UTC (rev 14=
692)
+++ commons-annotations/trunk/changelog.txt	2008-05-27 18:37:22 UTC (rev 14=
693)
@@ -1,6 +1,14 @@
 Hibernate Annotations Changelog
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
 =

+3.1.0.CR1 (27-05-2008)
+----------------------
+
+** New Feature
+    * [HCANN-1] - Move to slf4j
+    * [HCANN-2] - Add POM
+    * [HCANN-3] - Make build independent of Hibernate Core structure
+
 3.0.0.GA (19-03-2007)
 ---------------------
 =


Modified: commons-annotations/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/ivy/ivyconf.xml	2008-05-27 17:43:29 UTC (rev =
14692)
+++ commons-annotations/trunk/ivy/ivyconf.xml	2008-05-27 18:37:22 UTC (rev =
14693)
@@ -12,6 +12,9 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
+            <filesystem name=3D"maven-local" m2compatible=3D"true">
+                <artifact pattern=3D"${maven.local.repo}/[organization]/hi=
bernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+            </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: commons-annotations/trunk/lib/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/lib/README.txt	2008-05-27 17:43:29 UTC (rev 1=
4692)
+++ commons-annotations/trunk/lib/README.txt	2008-05-27 18:37:22 UTC (rev 1=
4693)
@@ -3,9 +3,10 @@
 =

 Core
 =3D=3D=3D=3D
-commons-logging.jar (see Hibernate Core version): required
-log4j.jar (see Hibernate Core version): optional
+slf4j-api.jar (see Hibernate Core version): required
+slf4j-*.jar (eg. slf4j-log4j12): required
+Your favorite logging framework: required
 =

 Test
 =3D=3D=3D=3D
-ejb3-persistence.jar (final release version): required
\ No newline at end of file
+ejb3-persistence.jar (1.0.2): required
\ No newline at end of file

Modified: commons-annotations/trunk/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/readme.txt	2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/readme.txt	2008-05-27 18:37:22 UTC (rev 14693)
@@ -1,6 +1,6 @@
 Hibernate Commons Annotations
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-Version: 3.0.0.GA, 19.03.2007
+Version: 3.1.0.CR1, 27.05.2008
 =

 Description
 -----------

Added: commons-annotations/trunk/src/java/org/hibernate/annotations/common/=
Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/Ver=
sion.java	                        (rev 0)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/Ver=
sion.java	2008-05-27 18:37:22 UTC (rev 14693)
@@ -0,0 +1,19 @@
+package org.hibernate.annotations.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Version {
+	public static final String VERSION =3D "3.1.0.CR1";
+	private static Logger log =3D LoggerFactory.getLogger( Version.class );
+
+	static {
+		log.info( "Hibernate Commons Annotations {}", VERSION );
+	}
+
+	public static void touch() {
+	}
+}

Modified: commons-annotations/trunk/src/java/org/hibernate/annotations/comm=
on/reflection/java/JavaReflectionManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/ref=
lection/java/JavaReflectionManager.java	2008-05-27 17:43:29 UTC (rev 14692)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/ref=
lection/java/JavaReflectionManager.java	2008-05-27 18:37:22 UTC (rev 14693)
@@ -20,6 +20,7 @@
 import org.hibernate.annotations.common.reflection.java.generics.TypeSwitc=
h;
 import org.hibernate.annotations.common.reflection.java.generics.TypeUtils;
 import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.Version;
 =

 /**
  * The factory for all the objects in this package.
@@ -30,7 +31,11 @@
  */
 public class JavaReflectionManager implements ReflectionManager {
 =

-    private static class TypeKey extends Pair<Type, TypeEnvironment> {
+	static {
+		Version.touch();
+	}
+
+	private static class TypeKey extends Pair<Type, TypeEnvironment> {
 		TypeKey(Type t, TypeEnvironment context) {
 			super( t, context );
 		}


--===============8483392518556092278==--

From hibernate-commits at lists.jboss.org Tue May 27 14:59:15 2008
Content-Type: multipart/mixed; boundary="===============3272548366067652539=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14694 - commons-annotations/trunk.
Date: Tue, 27 May 2008 14:59:15 -0400
Message-ID: <E1K14OB-0006Ur-7f@committer01.frg.pub.inap.atl.jboss.com>

--===============3272548366067652539==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 14:59:15 -0400 (Tue, 27 May 2008)
New Revision: 14694

Added:
   commons-annotations/trunk/build.properties.dist
Modified:
   commons-annotations/trunk/build.xml
Log:
add ability to run tests in dist

Added: commons-annotations/trunk/build.properties.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/build.properties.dist	                       =
 (rev 0)
+++ commons-annotations/trunk/build.properties.dist	2008-05-27 18:59:15 UTC=
 (rev 14694)
@@ -0,0 +1,3 @@
+common.dir=3D.
+src.dir=3Dsrc
+test.dir=3Dtest

Modified: commons-annotations/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/build.xml	2008-05-27 18:37:22 UTC (rev 14693)
+++ commons-annotations/trunk/build.xml	2008-05-27 18:59:15 UTC (rev 14694)
@@ -186,7 +186,16 @@
         <copy todir=3D"${dist.lib.dir}/build" failonerror=3D"false">
 			<fileset file=3D"${lib.dir}/build/*.jar"/>
         </copy>
+
+        <copy todir=3D"${dist.dir}/ivy" failonerror=3D"false">
+            <fileset dir=3D"${ivy.jar.dir}">
+                <include name=3D"**/*.*"/>
+            </fileset>
+        </copy>
         =

+        <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
+		</copy>
+        =

         <antcall target=3D"common-build.dist"/>
 	</target>
 =



--===============3272548366067652539==--

From hibernate-commits at lists.jboss.org Tue May 27 15:09:56 2008
Content-Type: multipart/mixed; boundary="===============6303269245426443344=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14695 -
 commons-annotations/trunk/ivy.
Date: Tue, 27 May 2008 15:09:56 -0400
Message-ID: <E1K14YW-0000sj-4z@committer01.frg.pub.inap.atl.jboss.com>

--===============6303269245426443344==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 15:09:55 -0400 (Tue, 27 May 2008)
New Revision: 14695

Modified:
   commons-annotations/trunk/ivy/ivyconf.xml
Log:
merge back local maven repos

Modified: commons-annotations/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- commons-annotations/trunk/ivy/ivyconf.xml	2008-05-27 18:59:15 UTC (rev =
14694)
+++ commons-annotations/trunk/ivy/ivyconf.xml	2008-05-27 19:09:55 UTC (rev =
14695)
@@ -13,7 +13,7 @@
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
             <filesystem name=3D"maven-local" m2compatible=3D"true">
-                <artifact pattern=3D"${maven.local.repo}/[organization]/hi=
bernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+                <artifact pattern=3D"${offline.repository.jboss.org}/[orga=
nization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ex=
t]"/>
             </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>


--===============6303269245426443344==--

From hibernate-commits at lists.jboss.org Tue May 27 15:18:16 2008
Content-Type: multipart/mixed; boundary="===============5916585922254715551=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14696 - in annotations/trunk:
 doc/reference/en and 3 other directories.
Date: Tue, 27 May 2008 15:18:16 -0400
Message-ID: <E1K14ga-0002ob-7T@committer01.frg.pub.inap.atl.jboss.com>

--===============5916585922254715551==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 15:18:16 -0400 (Tue, 27 May 2008)
New Revision: 14696

Modified:
   annotations/trunk/build.properties.dist
   annotations/trunk/build.xml
   annotations/trunk/changelog.txt
   annotations/trunk/doc/reference/en/master.xml
   annotations/trunk/doc/reference/en/modules/setup.xml
   annotations/trunk/ivy.xml
   annotations/trunk/ivy/ivyconf.xml
   annotations/trunk/pom.xml
   annotations/trunk/readme.txt
   annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
Log:
release annotations

Modified: annotations/trunk/build.properties.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/build.properties.dist	2008-05-27 19:09:55 UTC (rev 14=
695)
+++ annotations/trunk/build.properties.dist	2008-05-27 19:18:16 UTC (rev 14=
696)
@@ -1,8 +1,3 @@
 common.dir=3D.
 src.dir=3Dsrc
 test.dir=3Dtest
-hibernate-core.home=3D../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=3D./lib/ejb3-persistence.jar
-commons-annotations.jar=3D./lib/hibernate-commons-annotations.jar
\ No newline at end of file

Modified: annotations/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/build.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/build.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -273,6 +273,9 @@
 			<fileset file=3D"${lib.dir}/build/*.jar"/>
         </copy>
 =

+        <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+
         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
 		</copy>
 		<antcall target=3D"common-build.dist"/>

Modified: annotations/trunk/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/changelog.txt	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/changelog.txt	2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,6 +1,19 @@
 Hibernate Annotations Changelog
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
 =

+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+    * [ANN-741] - Move to slf4j
+
+** New Feature
+    * [ANN-713] - Use an ant task to deploy the maven artifacts
+    * [ANN-736] - Add pom
+    * [ANN-737] - Make build independent of Hibernate Core structure
+    * [ANN-738] - Move to Hibernate Core 3.3
+
+
 3.3.1.GA (14-03-2008)
 ---------------------
 =


Modified: annotations/trunk/doc/reference/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/doc/reference/en/master.xml	2008-05-27 19:09:55 UTC (=
rev 14695)
+++ annotations/trunk/doc/reference/en/master.xml	2008-05-27 19:18:16 UTC (=
rev 14696)
@@ -12,7 +12,7 @@
 =

     <subtitle>Reference Guide</subtitle>
 =

-    <releaseinfo>3.3.1.GA</releaseinfo>
+    <releaseinfo>3.4.0.CR1</releaseinfo>
 =

     <mediaobject>
       <imageobject>

Modified: annotations/trunk/doc/reference/en/modules/setup.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/doc/reference/en/modules/setup.xml	2008-05-27 19:09:5=
5 UTC (rev 14695)
+++ annotations/trunk/doc/reference/en/modules/setup.xml	2008-05-27 19:18:1=
6 UTC (rev 14696)
@@ -12,12 +12,11 @@
       </listitem>
 =

       <listitem>
-        <para><emphasis>This release requires Hibernate Core 3.2.0.GA and =
above.</emphasis></para>
+        <para><emphasis>This release requires Hibernate Core 3.3 and above=
.</emphasis></para>
       </listitem>
 =

       <listitem>
-        <para>This release is known to work on Hibernate Core 3.2.0 up to
-        3.2.2.GA</para>
+        <para>This release is known to work on Hibernate Core 3.3.CR1</par=
a>
       </listitem>
 =

       <listitem>

Modified: annotations/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/ivy/ivyconf.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy/ivyconf.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,6 +12,9 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
+            <filesystem name=3D"maven-local" m2compatible=3D"true">
+                <artifact pattern=3D"${offline.repository.jboss.org}/[orga=
nization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ex=
t]"/>
+            </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: annotations/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/ivy.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -14,7 +14,7 @@
     <dependencies>
         <!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
-        <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
+        <dependency name=3D"commons-annotations" rev=3D"3.1.0.CR1" conf=3D=
"default->default"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"def=
ault->default"/>
         <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>

Modified: annotations/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/pom.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/pom.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -34,7 +34,7 @@
 		</dependency>
         <dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
+			<artifactId>hibernate-core</artifactId>
 			<version>3.3.0.CR1</version>
 		</dependency>
 		<dependency>

Modified: annotations/trunk/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/readme.txt	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/readme.txt	2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,8 +1,8 @@
 Hibernate Annotations
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-Version: 3.3.1.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
 =

-THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.GA (an=
d above)
+THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.3 (and abo=
ve)
 =

 Description
 -----------

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2=
008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2=
008-05-27 19:18:16 UTC (rev 14696)
@@ -8,7 +8,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION =3D "3.3.1.GA";
+	public static final String VERSION =3D "3.4.0.CR1";
 	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {


--===============5916585922254715551==--

From hibernate-commits at lists.jboss.org Tue May 27 16:01:01 2008
Content-Type: multipart/mixed; boundary="===============0673903452447931781=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14697 - in entitymanager/trunk:
 doc/reference/en and 2 other directories.
Date: Tue, 27 May 2008 16:01:01 -0400
Message-ID: <E1K15Lx-0004ZF-0j@committer01.frg.pub.inap.atl.jboss.com>

--===============0673903452447931781==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:01:00 -0400 (Tue, 27 May 2008)
New Revision: 14697

Modified:
   entitymanager/trunk/build.properties.dist
   entitymanager/trunk/build.xml
   entitymanager/trunk/changelog.txt
   entitymanager/trunk/doc/reference/en/master.xml
   entitymanager/trunk/ivy.xml
   entitymanager/trunk/ivy/ivyconf.xml
   entitymanager/trunk/readme.txt
   entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
release entitymanager

Modified: entitymanager/trunk/build.properties.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/build.properties.dist	2008-05-27 19:18:16 UTC (rev =
14696)
+++ entitymanager/trunk/build.properties.dist	2008-05-27 20:01:00 UTC (rev =
14697)
@@ -2,11 +2,4 @@
 src.dir=3Dsrc
 test.dir=3Dtest
 resources.dir=3Dresources
-testresources.dir=3Dtest-resources
-hibernate-core.home=3D../hibernate-3.2
-
-
-#locally present jars
-jpa-api.jar=3D./lib/ejb3-persistence.jar
-commons-annotations.jar=3D./lib/hibernate-commons-annotations.jar
-annotations.jar=3D./lib/hibernate-annotations.jar
\ No newline at end of file
+testresources.dir=3Dtest-resources
\ No newline at end of file

Modified: entitymanager/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/build.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/build.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -416,6 +416,11 @@
 			<fileset file=3D"${lib.dir}/build/*.jar"/>
         </copy>
 =

+        <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/annotations.jar" tofile=3D"${dist.li=
b.dir}/hibernate-annotations.jar"/>
+
+
         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
         </copy>
         <antcall target=3D"common-build.dist"/>

Modified: entitymanager/trunk/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/changelog.txt	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/changelog.txt	2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,6 +1,18 @@
 Hibernate EntityManager Changelog
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 =

+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+    * [EJB-359] - Move to slf4j
+
+** New Feature
+    * [EJB-352] - Add pom
+    * [EJB-353] - Make build independent of Hibernate Core structure
+    * [EJB-354] - Move to Hibernate Core 3.3
+
+
 3.3.2.GA (14-03-2008)
 ---------------------
 =


Modified: entitymanager/trunk/doc/reference/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/doc/reference/en/master.xml	2008-05-27 19:18:16 UTC=
 (rev 14696)
+++ entitymanager/trunk/doc/reference/en/master.xml	2008-05-27 20:01:00 UTC=
 (rev 14697)
@@ -16,7 +16,7 @@
 =

     <subtitle>User guide</subtitle>
 =

-    <releaseinfo>3.3.2.GA</releaseinfo>
+    <releaseinfo>3.4.0.CR1</releaseinfo>
 =

     <mediaobject>
       <imageobject>

Modified: entitymanager/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/ivy/ivyconf.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy/ivyconf.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -12,6 +12,9 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
+            <filesystem name=3D"maven-local" m2compatible=3D"true">
+                <artifact pattern=3D"${offline.repository.jboss.org}/[orga=
nization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ex=
t]"/>
+            </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: entitymanager/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/ivy.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -14,8 +14,8 @@
     <dependencies>
 		<!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
-        <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
-        <dependency name=3D"annotations" rev=3D"latest" conf=3D"default->d=
efault"/>
+        <dependency name=3D"commons-annotations" rev=3D"3.1.0.CR1" conf=3D=
"default->default"/>
+        <dependency name=3D"annotations" rev=3D"3.4.0.CR1" conf=3D"default=
->default"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"def=
ault->default"/>
         <dependency org=3D"javax.transaction" name=3D"jta" rev=3D"1.1" con=
f=3D"default->default"/>

Modified: entitymanager/trunk/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/readme.txt	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/readme.txt	2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,8 +1,8 @@
 Hibernate EntityManager
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-Version: 3.3.2.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
 =

-THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.GA (=
and above)
+THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.3 (and a=
bove)
 =

 =

 Description

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-27 =
19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-27 =
20:01:00 UTC (rev 14697)
@@ -9,7 +9,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION =3D "3.3.2.GA";
+	public static final String VERSION =3D "3.4.0.CR1";
 	private static final Logger log =3D LoggerFactory.getLogger( Version.clas=
s );
 =

 	static {


--===============0673903452447931781==--

From hibernate-commits at lists.jboss.org Tue May 27 16:34:26 2008
Content-Type: multipart/mixed; boundary="===============0205714616704811530=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14698 - in validator/trunk:
 doc/reference/en and 2 other directories.
Date: Tue, 27 May 2008 16:34:25 -0400
Message-ID: <E1K15sH-0003Oc-VW@committer01.frg.pub.inap.atl.jboss.com>

--===============0205714616704811530==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:34:25 -0400 (Tue, 27 May 2008)
New Revision: 14698

Modified:
   validator/trunk/build.properties.dist
   validator/trunk/build.xml
   validator/trunk/changelog.txt
   validator/trunk/doc/reference/en/master.xml
   validator/trunk/ivy.xml
   validator/trunk/ivy/ivyconf.xml
   validator/trunk/readme.txt
   validator/trunk/src/java/org/hibernate/validator/Version.java
Log:
release validator

Modified: validator/trunk/build.properties.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/build.properties.dist	2008-05-27 20:01:00 UTC (rev 1469=
7)
+++ validator/trunk/build.properties.dist	2008-05-27 20:34:25 UTC (rev 1469=
8)
@@ -1,11 +1,3 @@
 common.dir=3D.
 src.dir=3Dsrc
-test.dir=3Dtest
-hibernate-core.home=3D../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=3D./lib/ejb3-persistence.jar
-jpa.jar=3D./lib/test/hibernate-entitymanager.jar
-archive-browsing.jar=3D./lib/test/jboss-archive-browsing.jar
-commons-annotations.jar=3D./lib/hibernate-commons-annotations.jar
-annotations.jar=3D./lib/test/hibernate-annotations.jar
\ No newline at end of file
+test.dir=3Dtest
\ No newline at end of file

Modified: validator/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/build.xml	2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/build.xml	2008-05-27 20:34:25 UTC (rev 14698)
@@ -25,7 +25,7 @@
 	<!-- Name of project and version, used to create filenames -->
 	<property name=3D"Name" value=3D"Hibernate Validator"/>
 	<property name=3D"name" value=3D"hibernate-validator"/>
-	<property name=3D"version" value=3D"3.0.0.GA"/>
+	<property name=3D"version" value=3D"3.1.0.CR1"/>
 	<property name=3D"javadoc.packagenames" value=3D"org.hibernate.validator.=
*"/>
 	<property name=3D"copy.test" value=3D"true"/>
 	<property name=3D"javac.source" value=3D"1.5"/>
@@ -266,6 +266,11 @@
 				<include name=3D"common-build.xml"/>
 			</fileset>
 		</copy>
+        <copy todir=3D"${dist.dir}/ivy" failonerror=3D"false">
+            <fileset dir=3D"${ivy.jar.dir}">
+                <include name=3D"**/*.*"/>
+            </fileset>
+        </copy>
 =

         <!-- copy dependencies -->
         <copy todir=3D"${dist.lib.dir}" failonerror=3D"false">
@@ -288,6 +293,11 @@
 			<fileset file=3D"${lib.dir}/build/*.jar"/>
         </copy>
 =

+        <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+
         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
 		</copy>
 		<antcall target=3D"common-build.dist"/>

Modified: validator/trunk/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/changelog.txt	2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/changelog.txt	2008-05-27 20:34:25 UTC (rev 14698)
@@ -1,6 +1,26 @@
 Hibernate Validator Changelog
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
 =

+3.1.0.CR1 (27-05-2008)
+----------------------
+
+** Bug
+    * [HV-14] - Minor typo in regular expression in class EmailValidator
+    * [HV-48] - There is no DefaultValidatorMessage_en leading to no messa=
ge loaded when locale is explicit and the system default is not en
+
+
+** Improvement
+    * [HV-57] - Move to slf4j
+
+** New Feature
+    * [HV-54] - Add pom
+    * [HV-55] - Make build independent of Hibernate Core structure
+    * [HV-56] - Move to Hibernate Core 3.3
+
+** Patch
+    * [HV-36] - DefaultValidatorMessages_ja.properties
+
+
 3.0.0.GA (19-03-2007)
 ---------------------
 =


Modified: validator/trunk/doc/reference/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/doc/reference/en/master.xml	2008-05-27 20:01:00 UTC (re=
v 14697)
+++ validator/trunk/doc/reference/en/master.xml	2008-05-27 20:34:25 UTC (re=
v 14698)
@@ -10,7 +10,7 @@
 =

     <subtitle>Reference Guide</subtitle>
 =

-    <releaseinfo>3.0.0.GA</releaseinfo>
+    <releaseinfo>3.1.0.CR1</releaseinfo>
 =

     <mediaobject>
       <imageobject>

Modified: validator/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/ivy/ivyconf.xml	2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/ivy/ivyconf.xml	2008-05-27 20:34:25 UTC (rev 14698)
@@ -12,6 +12,9 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
+            <filesystem name=3D"maven-local" m2compatible=3D"true">
+                <artifact pattern=3D"${offline.repository.jboss.org}/[orga=
nization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ex=
t]"/>
+            </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: validator/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/ivy.xml	2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/ivy.xml	2008-05-27 20:34:25 UTC (rev 14698)
@@ -14,7 +14,7 @@
     <dependencies>
         <!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
-        <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
+        <dependency name=3D"commons-annotations" rev=3D"3.1.0.CR1" conf=3D=
"default->default"/>
         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
         <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>
 =

@@ -24,13 +24,14 @@
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"tes=
t->default"/>
 =

         <!-- test deps -->
-        <dependency name=3D"annotations" rev=3D"latest" conf=3D"test->defa=
ult"/>
-        <dependency name=3D"entitymanager" rev=3D"latest" conf=3D"test->de=
fault"/>
+        <dependency name=3D"annotations" rev=3D"3.4.0.CR1" conf=3D"test->d=
efault"/>
+        <dependency name=3D"entitymanager" rev=3D"3.4.0.CR1" conf=3D"test-=
>default"/>
         <dependency org=3D"cglib" name=3D"cglib" rev=3D"2.1_3" conf=3D"tes=
t->default"/>
         <dependency org=3D"asm" name=3D"asm" rev=3D"1.5.3" conf=3D"test->d=
efault"/>
         <dependency org=3D"asm" name=3D"asm-attrs" rev=3D"1.5.3" conf=3D"t=
est->default"/>
         <dependency org=3D"org.slf4j" name=3D"slf4j-log4j12" rev=3D"1.4.2"=
 conf=3D"test->default"/>
         <dependency org=3D"log4j" name=3D"log4j" rev=3D"1.2.14" conf=3D"te=
st->default"/>
         <dependency org=3D"junit" name=3D"junit" rev=3D"3.8.1" conf=3D"tes=
t->default"/>
+        <dependency org=3D"javax.transaction" name=3D"jta" rev=3D"1.1" con=
f=3D"test->default"/>
     </dependencies>
 </ivy-module>
\ No newline at end of file

Modified: validator/trunk/readme.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/readme.txt	2008-05-27 20:01:00 UTC (rev 14697)
+++ validator/trunk/readme.txt	2008-05-27 20:34:25 UTC (rev 14698)
@@ -1,6 +1,6 @@
 Hibernate Validator
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
-Version: 3.0.0.GA, 19.03.2007
+Version: 3.1.0.CR1, 27.05.2008
 =

 Description
 -----------

Modified: validator/trunk/src/java/org/hibernate/validator/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/src/java/org/hibernate/validator/Version.java	2008-05-2=
7 20:01:00 UTC (rev 14697)
+++ validator/trunk/src/java/org/hibernate/validator/Version.java	2008-05-2=
7 20:34:25 UTC (rev 14698)
@@ -10,7 +10,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION =3D "3.0.0.GA";
+	public static final String VERSION =3D "3.1.0.CR1";
 	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {


--===============0205714616704811530==--

From hibernate-commits at lists.jboss.org Tue May 27 16:55:19 2008
Content-Type: multipart/mixed; boundary="===============5562702924207307281=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14699 - commons-annotations/tags.
Date: Tue, 27 May 2008 16:55:19 -0400
Message-ID: <E1K16CV-0000VI-0c@committer01.frg.pub.inap.atl.jboss.com>

--===============5562702924207307281==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:55:18 -0400 (Tue, 27 May 2008)
New Revision: 14699

Added:
   commons-annotations/tags/3.1.0.CR1/
Log:
release commons-annotations 3.1.0.CR1

Copied: commons-annotations/tags/3.1.0.CR1 (from rev 14698, commons-annotat=
ions/trunk)


--===============5562702924207307281==--

From hibernate-commits at lists.jboss.org Tue May 27 16:55:49 2008
Content-Type: multipart/mixed; boundary="===============6755997194463865647=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14700 - annotations/tags.
Date: Tue, 27 May 2008 16:55:49 -0400
Message-ID: <E1K16Cz-0000XT-8c@committer01.frg.pub.inap.atl.jboss.com>

--===============6755997194463865647==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:55:49 -0400 (Tue, 27 May 2008)
New Revision: 14700

Added:
   annotations/tags/3.4.0.CR1/
Log:
release annotations 3.4.0.CR1

Copied: annotations/tags/3.4.0.CR1 (from rev 14699, annotations/trunk)


--===============6755997194463865647==--

From hibernate-commits at lists.jboss.org Tue May 27 16:55:57 2008
Content-Type: multipart/mixed; boundary="===============7671646645826398536=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14701 - entitymanager/tags.
Date: Tue, 27 May 2008 16:55:57 -0400
Message-ID: <E1K16D7-0000Y5-59@committer01.frg.pub.inap.atl.jboss.com>

--===============7671646645826398536==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:55:57 -0400 (Tue, 27 May 2008)
New Revision: 14701

Added:
   entitymanager/tags/3.4.0.CR1/
Log:
release entitymanager 3.4.0.CR1

Copied: entitymanager/tags/3.4.0.CR1 (from rev 14700, entitymanager/trunk)


--===============7671646645826398536==--

From hibernate-commits at lists.jboss.org Tue May 27 16:56:11 2008
Content-Type: multipart/mixed; boundary="===============2426817638872224637=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14702 - validator/tags.
Date: Tue, 27 May 2008 16:56:11 -0400
Message-ID: <E1K16DL-0000Yz-3v@committer01.frg.pub.inap.atl.jboss.com>

--===============2426817638872224637==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-27 16:56:10 -0400 (Tue, 27 May 2008)
New Revision: 14702

Added:
   validator/tags/3.1.0.CR1/
Log:
release validator 3.1.0.CR1

Copied: validator/tags/3.1.0.CR1 (from rev 14701, validator/trunk)


--===============2426817638872224637==--

From hibernate-commits at lists.jboss.org Thu May 29 00:10:56 2008
Content-Type: multipart/mixed; boundary="===============2595865861576916887=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14703 - in search/trunk: ivy and
 1 other directory.
Date: Thu, 29 May 2008 00:10:56 -0400
Message-ID: <E1K1ZTc-0003fN-RN@committer01.frg.pub.inap.atl.jboss.com>

--===============2595865861576916887==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-29 00:10:56 -0400 (Thu, 29 May 2008)
New Revision: 14703

Modified:
   search/trunk/build.properties.dist
   search/trunk/build.xml
   search/trunk/ivy.xml
   search/trunk/ivy/ivyconf.xml
   search/trunk/pom.xml
Log:
Move dependencies to repository artifacts rather than latest

Modified: search/trunk/build.properties.dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/build.properties.dist	2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/build.properties.dist	2008-05-29 04:10:56 UTC (rev 14703)
@@ -1,12 +1,4 @@
 common.dir=3D.
 src.dir=3Dsrc
 test.dir=3Dtest
-testresources.dir=3Dtest-resources
-hibernate-core.home=3D../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=3D./lib/ejb3-persistence.jar
-commons-annotations.jar=3D./lib/hibernate-commons-annotations.jar
-annotations.jar=3D./lib/test/hibernate-annotations.jar
-entitymanager.jar=3D./lib/test/hibernate-entitymanager.jar
-validator.jar=3D./lib/test/hibernate-validator.jar
\ No newline at end of file
+testresources.dir=3Dtest-resources
\ No newline at end of file

Modified: search/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/build.xml	2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/build.xml	2008-05-29 04:10:56 UTC (rev 14703)
@@ -17,7 +17,7 @@
 	<!-- Name of project and version, used to create filenames -->
 	<property name=3D"Name" value=3D"Hibernate Search"/>
 	<property name=3D"name" value=3D"hibernate-search"/>
-	<property name=3D"version" value=3D"3.1.0.CR1"/>
+	<property name=3D"version" value=3D"3.1.0.Beta1"/>
 	<property name=3D"javadoc.packagenames" value=3D"org.hibernate.search.*"/>
 	<property name=3D"copy.test" value=3D"true"/>
 	<property name=3D"javac.source" value=3D"1.5"/>
@@ -355,6 +355,13 @@
 			<fileset file=3D"${lib.dir}/build/*.jar"/>
         </copy>
 =

+        <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tofile=
=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+
+
         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
 		</copy>
 		<antcall target=3D"common-build.dist"/>

Modified: search/trunk/ivy/ivyconf.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/ivy/ivyconf.xml	2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/ivy/ivyconf.xml	2008-05-29 04:10:56 UTC (rev 14703)
@@ -12,6 +12,9 @@
                 <ivy pattern=3D"../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern=3D"../[module]/target/[revision]/[artifa=
ct].[ext]"/>
             </filesystem>
+            <filesystem name=3D"maven-local" m2compatible=3D"true">
+                <artifact pattern=3D"${offline.repository.jboss.org}/[orga=
nization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ex=
t]"/>
+            </filesystem>
             <url name=3D"jboss-rep-maven-regular" m2compatible=3D"true">
                 <artifact pattern=3D"http://repository.jboss.org/maven2/[o=
rganization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: search/trunk/ivy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/ivy.xml	2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/ivy.xml	2008-05-29 04:10:56 UTC (rev 14703)
@@ -15,7 +15,7 @@
 		=

         <!-- compile time dependencies -->
         <dependency name=3D"ejb3-persistence" rev=3D"1.0.2.GA" conf=3D"def=
ault->default"/>
-        <dependency name=3D"commons-annotations" rev=3D"latest" conf=3D"de=
fault->default"/>
+        <dependency name=3D"commons-annotations" rev=3D"3.1.0.CR1" conf=3D=
"default->default"/>
         <dependency org=3D"org.slf4j" name=3D"slf4j-api" rev=3D"1.4.2" con=
f=3D"default->default"/>        =

         <dependency org=3D"org.hibernate" name=3D"hibernate-core" rev=3D"3=
.3.0.CR1" conf=3D"default->default"/>
         <dependency org=3D"javax.transaction" name=3D"jta" rev=3D"1.1" con=
f=3D"default->default"/>
@@ -30,8 +30,8 @@
         <dependency org=3D"dom4j" name=3D"dom4j" rev=3D"1.6.1" conf=3D"tes=
t->default"/>
 =

         <!-- test deps -->
-        <dependency name=3D"annotations" rev=3D"latest" conf=3D"test->defa=
ult"/>
-        <dependency name=3D"entitymanager" rev=3D"latest" conf=3D"test->de=
fault"/>
+        <dependency name=3D"annotations" rev=3D"3.4.0.CR1" conf=3D"test->d=
efault"/>
+        <dependency name=3D"entitymanager" rev=3D"3.4.0.CR1" conf=3D"test-=
>default"/>
         <dependency org=3D"cglib" name=3D"cglib" rev=3D"2.1_3" conf=3D"tes=
t->default"/>
         <dependency org=3D"asm" name=3D"asm" rev=3D"1.5.3" conf=3D"test->d=
efault"/>
         <dependency org=3D"asm" name=3D"asm-attrs" rev=3D"1.5.3" conf=3D"t=
est->default"/>

Modified: search/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/pom.xml	2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/pom.xml	2008-05-29 04:10:56 UTC (rev 14703)
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-search</artifactId>
-    <version>3.1.0.CR1</version>
+    <version>3.1.0.Beta1</version>
     <description>Hibernate Search</description>
     <dependencies>
         <dependency>


--===============2595865861576916887==--

From hibernate-commits at lists.jboss.org Thu May 29 07:27:38 2008
Content-Type: multipart/mixed; boundary="===============3229492627965679233=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14704 -
 search/trunk/src/java/org/hibernate/search.
Date: Thu, 29 May 2008 07:27:38 -0400
Message-ID: <E1K1gIE-0002LO-Ow@committer01.frg.pub.inap.atl.jboss.com>

--===============3229492627965679233==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-29 07:27:38 -0400 (Thu, 29 May 2008)
New Revision: 14704

Modified:
   search/trunk/src/java/org/hibernate/search/Version.java
Log:
"Version" class releases Logger to gc after use

Modified: search/trunk/src/java/org/hibernate/search/Version.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/Version.java	2008-05-29 04:1=
0:56 UTC (rev 14703)
+++ search/trunk/src/java/org/hibernate/search/Version.java	2008-05-29 11:2=
7:38 UTC (rev 14704)
@@ -12,9 +12,9 @@
  */
 public class Version {
 	public static final String VERSION =3D "3.1.x." + new Date();
-	private static Logger log =3D LoggerFactory.getLogger( Version.class );
 =

 	static {
+		Logger log =3D LoggerFactory.getLogger( Version.class );
 		log.info( "Hibernate Search {}", VERSION );
 	}
 =



--===============3229492627965679233==--

From hibernate-commits at lists.jboss.org Thu May 29 07:44:14 2008
Content-Type: multipart/mixed; boundary="===============0043721847404134876=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14705 -
 search/trunk/doc/reference/en/modules.
Date: Thu, 29 May 2008 07:44:14 -0400
Message-ID: <E1K1gYI-0005mz-4o@committer01.frg.pub.inap.atl.jboss.com>

--===============0043721847404134876==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hardy.ferentschik
Date: 2008-05-29 07:44:13 -0400 (Thu, 29 May 2008)
New Revision: 14705

Modified:
   search/trunk/doc/reference/en/modules/mapping.xml
Log:
HSEARCH-198 Updated the documentation regarding the term vector configurati=
on

Modified: search/trunk/doc/reference/en/modules/mapping.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/doc/reference/en/modules/mapping.xml	2008-05-29 11:27:38 U=
TC (rev 14704)
+++ search/trunk/doc/reference/en/modules/mapping.xml	2008-05-29 11:44:13 U=
TC (rev 14705)
@@ -4,9 +4,10 @@
   <title>Mapping entities to the index structure</title>
 =

   <para>All the metadata information needed to index entities is described
-  through some Java annotations. There is no need for xml mapping files no=
r a
-  list of indexed entities. The list is discovered at startup time scanning
-  the Hibernate mapped entities.</para>
+  through some Java annotations. There is no need for xml mapping files (in
+  fact there exists currently no xml configuration option) nor a list of
+  indexed entities. The list is discovered at startup time scanning the
+  Hibernate mapped entities.</para>
 =

   <section id=3D"search-mapping-entity" revision=3D"3">
     <title>Mapping an entity</title>
@@ -70,14 +71,12 @@
           <literal>Index.NO_NORM</literal> (do not store the normalization
           data). The default value is <literal>TOKENIZED</literal>.</para>
         </listitem>
-      </itemizedlist>
 =

-      <itemizedlist>
         <listitem>
-          <para>termVector: describes collections of term-frequency pairs.=
 To
-          utilize Term Vectors this attribute enables their being stored
-          during indexing so they are stored with documents. The default v=
alue
-          is Field.TermVector.NO.</para>
+          <para>termVector: describes collections of term-frequency pairs.
+          This attribute enables term vectors being stored during indexing=
 so
+          they are available within documents. The default value is
+          TermVector.NO.</para>
 =

           <para>The different values of this attribute are</para>
 =

@@ -95,7 +94,7 @@
 =

               <tbody>
                 <row>
-                  <entry align=3D"left">Field.TermVector.YES</entry>
+                  <entry align=3D"left">TermVector.YES</entry>
 =

                   <entry>Store the term vectors of each document. This
                   produces two synchronized arrays, one contains document
@@ -103,32 +102,32 @@
                 </row>
 =

                 <row>
-                  <entry align=3D"left">Field.TermVector.NO</entry>
+                  <entry align=3D"left">TermVector.NO</entry>
 =

                   <entry>Do not store term vectors.</entry>
                 </row>
 =

                 <row>
-                  <entry align=3D"left">Field.TermVector.WITH_OFFSETS</ent=
ry>
+                  <entry align=3D"left">TermVector.WITH_OFFSETS</entry>
 =

                   <entry>Store the term vector and token offset informatio=
n.
-                  This is the same as Field.TermVector.YES plus this conta=
ins
-                  the starting and ending offset position information for =
the
-                  terms</entry>
+                  This is the same as TermVector.YES plus it contains the
+                  starting and ending offset position information for the
+                  terms.</entry>
                 </row>
 =

                 <row>
-                  <entry align=3D"left">Field.TermVector.WITH_POSITIONS</e=
ntry>
+                  <entry align=3D"left">TermVector.WITH_POSITIONS</entry>
 =

                   <entry>Store the term vector and token position informat=
ion.
-                  This is the same as Field.TermVector.YES plus this conta=
ins
-                  the ordinal positions of each occurrence of a term in a
+                  This is the same as TermVector.YES plus it contains the
+                  ordinal positions of each occurrence of a term in a
                   document.</entry>
                 </row>
 =

                 <row>
                   <entry
-                  align=3D"left">Field.TermVector.WITH_POSITIONS_OFFSETS</=
entry>
+                  align=3D"left">TermVector.WITH_POSITIONS_OFFSETS</entry>
 =

                   <entry>Store the term vector, token position and offset
                   information. This is a combination of the YES, WITH_OFFS=
ETS


--===============0043721847404134876==--

From hibernate-commits at lists.jboss.org Thu May 29 07:48:36 2008
Content-Type: multipart/mixed; boundary="===============4363390736680245000=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14706 - search/trunk.
Date: Thu, 29 May 2008 07:48:36 -0400
Message-ID: <E1K1gcW-0006vx-5N@committer01.frg.pub.inap.atl.jboss.com>

--===============4363390736680245000==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hardy.ferentschik
Date: 2008-05-29 07:48:36 -0400 (Thu, 29 May 2008)
New Revision: 14706

Modified:
   search/trunk/build.xml
Log:
- Changed some of the comments. This is the Hibernate Search and not Annota=
tion build file

- Also commented out the copying of commons-annotation to the test director=
y of the dist (see dist target). There is no commons-annotation to copy.

Modified: search/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/build.xml	2008-05-29 11:44:13 UTC (rev 14705)
+++ search/trunk/build.xml	2008-05-29 11:48:36 UTC (rev 14706)
@@ -1,8 +1,8 @@
 <!--
 =

-  Hibernate Annotations ANT build script.
+  Hibernate Search ANT build script.
 =

-  You need JDK 5.0 installed to build Hibernate Annotations.
+  You need JDK 5.0 installed to build Hibernate Search.
 =

 -->
 =

@@ -357,7 +357,7 @@
 =

         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
         <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
-        <move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tofile=
=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"/>
+        <!--move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tof=
ile=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"/-->
         <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"/>
         <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"/>
 =



--===============4363390736680245000==--

From hibernate-commits at lists.jboss.org Thu May 29 07:50:16 2008
Content-Type: multipart/mixed; boundary="===============8340312668170102190=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14707 - in
 search/trunk/src/java/org/hibernate/search: backend/impl and 3 other
 directories.
Date: Thu, 29 May 2008 07:50:16 -0400
Message-ID: <E1K1ge8-0007fC-4W@committer01.frg.pub.inap.atl.jboss.com>

--===============8340312668170102190==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hardy.ferentschik
Date: 2008-05-29 07:50:15 -0400 (Thu, 29 May 2008)
New Revision: 14707

Modified:
   search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.ja=
va
   search/trunk/src/java/org/hibernate/search/backend/impl/PostTransactionW=
orkQueueSynchronization.java
   search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java
   search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java
   search/trunk/src/java/org/hibernate/search/bridge/builtin/NumberBridge.j=
ava
   search/trunk/src/java/org/hibernate/search/bridge/builtin/StringBridge.j=
ava
   search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java
Log:
- Import cleanup and small javadoc updates

Modified: search/trunk/src/java/org/hibernate/search/backend/OptimizeLucene=
Work.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.j=
ava	2008-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.j=
ava	2008-05-29 11:50:15 UTC (rev 14707)
@@ -1,8 +1,6 @@
 // $Id$
 package org.hibernate.search.backend;
 =

-import java.io.Serializable;
-
 /**
  * @author Andrew Hahn
  * @author Emmanuel Bernard

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/PostTrans=
actionWorkQueueSynchronization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/PostTransaction=
WorkQueueSynchronization.java	2008-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/PostTransaction=
WorkQueueSynchronization.java	2008-05-29 11:50:15 UTC (rev 14707)
@@ -1,14 +1,10 @@
 //$Id$
 package org.hibernate.search.backend.impl;
 =

-import java.util.List;
-import java.util.ArrayList;
-import java.io.Serializable;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 =

 import org.hibernate.search.backend.QueueingProcessor;
-import org.hibernate.search.backend.WorkType;
 import org.hibernate.search.backend.Work;
 import org.hibernate.search.backend.WorkQueue;
 import org.hibernate.search.util.WeakIdentityHashMap;

Modified: search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java	20=
08-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java	20=
08-05-29 11:50:15 UTC (rev 14707)
@@ -3,38 +3,39 @@
 =

 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.URI;
+import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.net.URL;
-import java.net.URI;
 =

+import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.XClass;
+import org.hibernate.annotations.common.reflection.XMember;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.annotations.ClassBridge;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Resolution;
+import org.hibernate.search.bridge.builtin.BigDecimalBridge;
+import org.hibernate.search.bridge.builtin.BigIntegerBridge;
+import org.hibernate.search.bridge.builtin.BooleanBridge;
 import org.hibernate.search.bridge.builtin.DateBridge;
+import org.hibernate.search.bridge.builtin.DoubleBridge;
+import org.hibernate.search.bridge.builtin.EnumBridge;
 import org.hibernate.search.bridge.builtin.FloatBridge;
+import org.hibernate.search.bridge.builtin.IntegerBridge;
 import org.hibernate.search.bridge.builtin.LongBridge;
-import org.hibernate.search.bridge.builtin.BigIntegerBridge;
+import org.hibernate.search.bridge.builtin.ShortBridge;
 import org.hibernate.search.bridge.builtin.StringBridge;
-import org.hibernate.search.bridge.builtin.IntegerBridge;
-import org.hibernate.search.bridge.builtin.BigDecimalBridge;
-import org.hibernate.search.bridge.builtin.DoubleBridge;
-import org.hibernate.search.bridge.builtin.ShortBridge;
-import org.hibernate.search.bridge.builtin.EnumBridge;
-import org.hibernate.search.bridge.builtin.BooleanBridge;
+import org.hibernate.search.bridge.builtin.UriBridge;
 import org.hibernate.search.bridge.builtin.UrlBridge;
-import org.hibernate.search.bridge.builtin.UriBridge;
-import org.hibernate.search.annotations.Resolution;
-import org.hibernate.search.annotations.Parameter;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.ClassBridge;
-import org.hibernate.search.SearchException;
-import org.hibernate.search.util.BinderHelper;
-import org.hibernate.annotations.common.reflection.XClass;
-import org.hibernate.annotations.common.reflection.XMember;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
 =

 /**
+ * This factory is responsible for creating and initializing build-in and =
custom <i>FieldBridges</i>.
+ * =

  * @author Emmanuel Bernard
  * @author John Griffin
  */

Modified: search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java	2008=
-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java	2008=
-05-29 11:50:15 UTC (rev 14707)
@@ -10,8 +10,6 @@
  *
  * @author Emmanuel Bernard
  */
-//TODO should show Field or document?
-//document is nice since I can save an object into several fields
 public interface FieldBridge {
 	/**
 	 * Manipulate the document to index the given value.

Modified: search/trunk/src/java/org/hibernate/search/bridge/builtin/NumberB=
ridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/builtin/NumberBridge.=
java	2008-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/bridge/builtin/NumberBridge.=
java	2008-05-29 11:50:15 UTC (rev 14707)
@@ -1,10 +1,11 @@
 //$Id$
 package org.hibernate.search.bridge.builtin;
 =

-import org.hibernate.search.bridge.StringBridge;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 =

 /**
+ * Base class for numbers - integer, double, etc.
+ * =

  * @author Emmanuel Bernard
  */
 public abstract class NumberBridge implements TwoWayStringBridge {

Modified: search/trunk/src/java/org/hibernate/search/bridge/builtin/StringB=
ridge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/builtin/StringBridge.=
java	2008-05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/bridge/builtin/StringBridge.=
java	2008-05-29 11:50:15 UTC (rev 14707)
@@ -1,7 +1,6 @@
 //$Id$
 package org.hibernate.search.bridge.builtin;
 =

-
 /**
  * Map a string element
  *

Modified: search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java	2008-=
05-29 11:48:36 UTC (rev 14706)
+++ search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java	2008-=
05-29 11:50:15 UTC (rev 14707)
@@ -3,7 +3,6 @@
 =

 import java.io.Serializable;
 import java.util.List;
-import java.util.ArrayList;
 =

 /**
  *


--===============8340312668170102190==--

From hibernate-commits at lists.jboss.org Thu May 29 07:56:45 2008
Content-Type: multipart/mixed; boundary="===============2392309711020724554=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14708 -
 search/trunk/src/java/org/hibernate/search/engine.
Date: Thu, 29 May 2008 07:56:45 -0400
Message-ID: <E1K1gkP-0000iz-JE@committer01.frg.pub.inap.atl.jboss.com>

--===============2392309711020724554==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-29 07:56:45 -0400 (Thu, 29 May 2008)
New Revision: 14708

Modified:
   search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
Log:
use of Collections.EMPTY_LIST for empty results

Modified: search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java	2008=
-05-29 11:50:15 UTC (rev 14707)
+++ search/trunk/src/java/org/hibernate/search/engine/QueryLoader.java	2008=
-05-29 11:56:45 UTC (rev 14708)
@@ -2,6 +2,7 @@
 package org.hibernate.search.engine;
 =

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 =

 import org.hibernate.Criteria;
@@ -18,7 +19,6 @@
  */
 public class QueryLoader implements Loader {
 	private static final int MAX_IN_CLAUSE =3D 500;
-	private static final List EMPTY_LIST =3D new ArrayList( 0 );
 	private final Logger log =3D LoggerFactory.getLogger( QueryLoader.class );
 =

 	private Session session;
@@ -35,7 +35,6 @@
 		this.entityType =3D entityType;
 	}
 =

-
 	public Object load(EntityInfo entityInfo) {
 		//be sure to get an initialized object
 		Object maybeProxy =3D session.get( entityInfo.clazz, entityInfo.id );
@@ -57,7 +56,7 @@
 =

 	public List load(EntityInfo... entityInfos) {
 		final int maxResults =3D entityInfos.length;
-		if ( maxResults =3D=3D 0 ) return EMPTY_LIST;
+		if ( maxResults =3D=3D 0 ) return Collections.EMPTY_LIST;
 		if ( entityType =3D=3D null ) throw new AssertionFailure( "EntityType no=
t defined" );
 		if ( criteria =3D=3D null ) criteria =3D session.createCriteria( entityT=
ype );
 =



--===============2392309711020724554==--

From hibernate-commits at lists.jboss.org Thu May 29 10:43:52 2008
Content-Type: multipart/mixed; boundary="===============8281509028244394985=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14709 -
 search/trunk/src/java/org/hibernate/search/backend.
Date: Thu, 29 May 2008 10:43:52 -0400
Message-ID: <E1K1jM8-0005GW-E9@committer01.frg.pub.inap.atl.jboss.com>

--===============8281509028244394985==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-29 10:43:52 -0400 (Thu, 29 May 2008)
New Revision: 14709

Modified:
   search/trunk/src/java/org/hibernate/search/backend/AddLuceneWork.java
   search/trunk/src/java/org/hibernate/search/backend/DeleteLuceneWork.java
   search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java
   search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.ja=
va
   search/trunk/src/java/org/hibernate/search/backend/PurgeAllLuceneWork.ja=
va
Log:
LuceneWork implementations made Serializable, assigned UID.

Modified: search/trunk/src/java/org/hibernate/search/backend/AddLuceneWork.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/AddLuceneWork.java	2=
008-05-29 11:56:45 UTC (rev 14708)
+++ search/trunk/src/java/org/hibernate/search/backend/AddLuceneWork.java	2=
008-05-29 14:43:52 UTC (rev 14709)
@@ -8,7 +8,10 @@
 /**
  * @author Emmanuel Bernard
  */
-public class AddLuceneWork extends LuceneWork {
+public class AddLuceneWork extends LuceneWork implements Serializable {
+
+	private static final long serialVersionUID =3D -2450349312813297371L;
+
 	public AddLuceneWork(Serializable id, String idInString, Class entity, Do=
cument document) {
 		super( id, idInString, entity, document );
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/DeleteLuceneWo=
rk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/DeleteLuceneWork.jav=
a	2008-05-29 11:56:45 UTC (rev 14708)
+++ search/trunk/src/java/org/hibernate/search/backend/DeleteLuceneWork.jav=
a	2008-05-29 14:43:52 UTC (rev 14709)
@@ -6,7 +6,9 @@
 /**
  * @author Emmanuel Bernard
  */
-public class DeleteLuceneWork extends LuceneWork {
+public class DeleteLuceneWork extends LuceneWork implements Serializable {
+	private static final long serialVersionUID =3D -854604138119230246L;
+
 	public DeleteLuceneWork(Serializable id, String idInString, Class entity)=
 {
 		super( id, idInString, entity );
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java	2008=
-05-29 11:56:45 UTC (rev 14708)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java	2008=
-05-29 14:43:52 UTC (rev 14709)
@@ -12,16 +12,16 @@
  * @author Hardy Ferentschik
  */
 public abstract class LuceneWork implements Serializable {
-	//TODO set a serial id
-	private Document document;
-	private Class entityClass;
-	private Serializable id;
+
+	private final Document document;
+	private final Class entityClass;
+	private final Serializable id;
 	=

 	/**
 	 * Flag indicating if this lucene work has to be indexed in batch mode.
 	 */
 	private boolean batch =3D false;
-	private String idInString;
+	private final String idInString;
 =

 	public LuceneWork(Serializable id, String idInString, Class entity) {
 		this( id, idInString, entity, null );
@@ -38,6 +38,7 @@
 		return batch;
 	}
 =

+	//TODO move to final field, or enable synchronization?
 	public void setBatch(boolean batch) {
 		this.batch =3D batch;
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/OptimizeLucene=
Work.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.j=
ava	2008-05-29 11:56:45 UTC (rev 14708)
+++ search/trunk/src/java/org/hibernate/search/backend/OptimizeLuceneWork.j=
ava	2008-05-29 14:43:52 UTC (rev 14709)
@@ -1,11 +1,13 @@
 // $Id$
 package org.hibernate.search.backend;
 =

+import java.io.Serializable;
+
 /**
  * @author Andrew Hahn
  * @author Emmanuel Bernard
  */
-public class OptimizeLuceneWork extends LuceneWork {
+public class OptimizeLuceneWork extends LuceneWork implements Serializable=
 {
 	public OptimizeLuceneWork(Class entity) {
 		super( null, null, entity );
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/PurgeAllLucene=
Work.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/PurgeAllLuceneWork.j=
ava	2008-05-29 11:56:45 UTC (rev 14708)
+++ search/trunk/src/java/org/hibernate/search/backend/PurgeAllLuceneWork.j=
ava	2008-05-29 14:43:52 UTC (rev 14709)
@@ -8,7 +8,9 @@
  *
  * @author John Griffin
  */
-public class PurgeAllLuceneWork extends LuceneWork {
+public class PurgeAllLuceneWork extends LuceneWork implements Serializable=
 {
+	private static final long serialVersionUID =3D 8124091288284011715L;
+
 	public PurgeAllLuceneWork(Class entity) {
 		super( null, null, entity, null );
 	}


--===============8281509028244394985==--

From hibernate-commits at lists.jboss.org Thu May 29 11:12:07 2008
Content-Type: multipart/mixed; boundary="===============2436209147159421751=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14710 - entitymanager/trunk and 1
 other directories.
Date: Thu, 29 May 2008 11:12:06 -0400
Message-ID: <E1K1jnS-0003qr-Sp@committer01.frg.pub.inap.atl.jboss.com>

--===============2436209147159421751==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-29 11:12:06 -0400 (Thu, 29 May 2008)
New Revision: 14710

Modified:
   annotations/trunk/build.xml
   entitymanager/trunk/build.xml
   validator/trunk/build.xml
Log:
Silently fail on file move

Modified: annotations/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- annotations/trunk/build.xml	2008-05-29 14:43:52 UTC (rev 14709)
+++ annotations/trunk/build.xml	2008-05-29 15:12:06 UTC (rev 14710)
@@ -274,7 +274,8 @@
         </copy>
 =

         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
-        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"
+              failonerror=3D"false"/>
 =

         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
 		</copy>

Modified: entitymanager/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- entitymanager/trunk/build.xml	2008-05-29 14:43:52 UTC (rev 14709)
+++ entitymanager/trunk/build.xml	2008-05-29 15:12:06 UTC (rev 14710)
@@ -417,8 +417,10 @@
         </copy>
 =

         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
-        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
-        <move file=3D"${dist.lib.dir}/annotations.jar" tofile=3D"${dist.li=
b.dir}/hibernate-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"
+              failonerror=3D"false"/>
+        <move file=3D"${dist.lib.dir}/annotations.jar" tofile=3D"${dist.li=
b.dir}/hibernate-annotations.jar"
+              failonerror=3D"false"/>
 =

 =

         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">

Modified: validator/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/build.xml	2008-05-29 14:43:52 UTC (rev 14709)
+++ validator/trunk/build.xml	2008-05-29 15:12:06 UTC (rev 14710)
@@ -294,9 +294,12 @@
         </copy>
 =

         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
-        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
-        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"/>
-        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"
+              failonerror=3D"false"/>
+        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"
+              failonerror=3D"false"/>
+        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"
+              failonerror=3D"false"/>
 =

         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">
 		</copy>


--===============2436209147159421751==--

From hibernate-commits at lists.jboss.org Thu May 29 11:12:26 2008
Content-Type: multipart/mixed; boundary="===============2980600379185186102=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14711 - search/trunk.
Date: Thu, 29 May 2008 11:12:26 -0400
Message-ID: <E1K1jnm-0003sG-0f@committer01.frg.pub.inap.atl.jboss.com>

--===============2980600379185186102==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-29 11:12:25 -0400 (Thu, 29 May 2008)
New Revision: 14711

Modified:
   search/trunk/build.xml
Log:
Silently fail on file move

Modified: search/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/build.xml	2008-05-29 15:12:06 UTC (rev 14710)
+++ search/trunk/build.xml	2008-05-29 15:12:25 UTC (rev 14711)
@@ -356,10 +356,13 @@
         </copy>
 =

         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
-        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"
+              failonerror=3D"false"/>
         <!--move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tof=
ile=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"/-->
-        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"/>
-        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+        <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"
+              failonerror=3D"false"/>
+        <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"
+              failonerror=3D"false"/>
 =

 =

         <copy file=3D"${basedir}/build.properties.dist" tofile=3D"${dist.d=
ir}/build.properties" failonerror=3D"false">


--===============2980600379185186102==--

From hibernate-commits at lists.jboss.org Thu May 29 11:14:13 2008
Content-Type: multipart/mixed; boundary="===============5138004954613097376=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN:  r14712 - search/trunk.
Date: Thu, 29 May 2008 11:14:13 -0400
Message-ID: <E1K1jpV-0003vE-KJ@committer01.frg.pub.inap.atl.jboss.com>

--===============5138004954613097376==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-29 11:14:13 -0400 (Thu, 29 May 2008)
New Revision: 14712

Modified:
   search/trunk/build.xml
Log:
uncommenting hardy's fix

Modified: search/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/build.xml	2008-05-29 15:12:25 UTC (rev 14711)
+++ search/trunk/build.xml	2008-05-29 15:14:13 UTC (rev 14712)
@@ -358,7 +358,8 @@
         <!-- ivy uses the module name without hibernate- (to mimic the dir=
ectory names). Revert the situation -->
         <move file=3D"${dist.lib.dir}/commons-annotations.jar" tofile=3D"$=
{dist.lib.dir}/hibernate-commons-annotations.jar"
               failonerror=3D"false"/>
-        <!--move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tof=
ile=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"/-->
+        <move file=3D"${dist.lib.dir}/test/commons-annotations.jar" tofile=
=3D"${dist.lib.dir}/test/hibernate-commons-annotations.jar"
+              failonerror=3D"false"/>
         <move file=3D"${dist.lib.dir}/test/annotations.jar" tofile=3D"${di=
st.lib.dir}/test/hibernate-annotations.jar"
               failonerror=3D"false"/>
         <move file=3D"${dist.lib.dir}/test/entitymanager.jar" tofile=3D"${=
dist.lib.dir}/test/hibernate-entitymanager.jar"


--===============5138004954613097376==--

From hibernate-commits at lists.jboss.org Thu May 29 11:18:15 2008
Content-Type: multipart/mixed; boundary="===============2092859432004210239=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14713 - in search/trunk/src:
 java/org/hibernate/search/backend and 15 other directories.
Date: Thu, 29 May 2008 11:18:15 -0400
Message-ID: <E1K1jtP-00054F-9D@committer01.frg.pub.inap.atl.jboss.com>

--===============2092859432004210239==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-29 11:18:15 -0400 (Thu, 29 May 2008)
New Revision: 14713

Modified:
   search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java
   search/trunk/src/java/org/hibernate/search/annotations/FieldBridge.java
   search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParamet=
ers.java
   search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.java
   search/trunk/src/java/org/hibernate/search/backend/Work.java
   search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedP=
roperty.java
   search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingP=
rocessor.java
   search/trunk/src/java/org/hibernate/search/backend/impl/PostTransactionW=
orkQueueSynchronization.java
   search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWor=
ker.java
   search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSH=
ibernateSearchController.java
   search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBac=
kendQueueProcessor.java
   search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWor=
ker.java
   search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAdap=
tor.java
   search/trunk/src/java/org/hibernate/search/bridge/TwoWayString2FieldBrid=
geAdaptor.java
   search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.java
   search/trunk/src/java/org/hibernate/search/engine/DocumentExtractor.java
   search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java
   search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListe=
ner.java
   search/trunk/src/java/org/hibernate/search/filter/ChainedFilter.java
   search/trunk/src/java/org/hibernate/search/filter/StandardFilterKey.java
   search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
   search/trunk/src/java/org/hibernate/search/impl/InitContext.java
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManage=
rImpl.java
   search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.ja=
va
   search/trunk/src/java/org/hibernate/search/query/FullTextFilterImpl.java
   search/trunk/src/java/org/hibernate/search/query/IteratorImpl.java
   search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.j=
ava
   search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.j=
ava
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactor=
y.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper=
.java
   search/trunk/src/test/org/hibernate/search/test/bridge/UnresolvedBridgeT=
est.java
Log:
general code review: unused imports deleted, typos in comments and error me=
ssages, some "final" added to fields.

Modified: search/trunk/src/java/org/hibernate/search/annotations/ClassBridg=
e.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java=
	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java=
	2008-05-29 15:18:15 UTC (rev 14713)
@@ -10,7 +10,7 @@
 /**
  * This annotation allows a user to apply an implementation
  * class to a Lucene document to manipulate it in any way
- * the usersees fit.
+ * the user sees fit.
  *
  * @author John Griffin
  */
@@ -48,7 +48,7 @@
 	TermVector termVector() default TermVector.NO;
 =

 	/**
-	 * A float value of the amount of lucene defined
+	 * A float value of the amount of Lucene defined
 	 * boost to apply to a field.
 	 */
 	Boost boost() default @Boost(value=3D1.0F);
@@ -60,7 +60,7 @@
 	public Class impl() default void.class;
 =

 	/**
-	 * Array of fields to work with. The imnpl class
+	 * Array of fields to work with. The impl class
 	 * above will work on these fields.
 	 */
 	public Parameter[] params() default {};

Modified: search/trunk/src/java/org/hibernate/search/annotations/FieldBridg=
e.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/annotations/FieldBridge.java=
	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/annotations/FieldBridge.java=
	2008-05-29 15:18:15 UTC (rev 14713)
@@ -16,7 +16,7 @@
 @Target( {ElementType.FIELD, ElementType.METHOD} )
 @Documented
 public @interface FieldBridge {
-	//defaault to embed @FieldBridge in @Field
+	//default to embed @FieldBridge in @Field
 	public Class impl() default void.class;
 =

 	public Parameter[] params() default {};

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexing=
Parameters.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -27,8 +27,9 @@
 public class LuceneIndexingParameters implements Serializable {
 =

 	private static final long serialVersionUID =3D 5424606407623591663L;
-	private static Logger log =3D LoggerFactory.getLogger( LuceneIndexingPara=
meters.class );
 	=

+	private final Logger log =3D LoggerFactory.getLogger( LuceneIndexingParam=
eters.class );
+	=

 	// value keyword
 	public static final String EXPLICIT_DEFAULT_VALUE =3D "default";
 	// property path keywords

Modified: search/trunk/src/java/org/hibernate/search/backend/QueueingProces=
sor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.ja=
va	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/QueueingProcessor.ja=
va	2008-05-29 15:18:15 UTC (rev 14713)
@@ -1,11 +1,6 @@
 //$Id$
 package org.hibernate.search.backend;
 =

-import java.util.List;
-import java.io.Serializable;
-
-import org.hibernate.search.backend.LuceneWork;
-
 /**
  * Pile work operations
  * No thread safety has to be implemented, the queue being scoped already
@@ -18,7 +13,7 @@
 public interface QueueingProcessor {
 	/**
 	 * Add a work
-	 * TODO move that womewhere else, it does not really fit here
+	 * TODO move that somewhere else, it does not really fit here
 	 */
 	void add(Work work, WorkQueue workQueue);
 =


Modified: search/trunk/src/java/org/hibernate/search/backend/Work.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Work.java	2008-05-29=
 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/Work.java	2008-05-29=
 15:18:15 UTC (rev 14713)
@@ -11,31 +11,33 @@
  * @author Emmanuel Bernard
  */
 public class Work {
-	private Object entity;
-	private Class entityClass;
-	private Serializable id;
-	private XMember idGetter;
-	private WorkType type;
+	private final Object entity;
+	private final Class entityClass;
+	private final Serializable id;
+	private final XMember idGetter;
+	private final WorkType type;
 =

-
 	public Work(Object entity, Serializable id, WorkType type) {
-		this.entity =3D entity;
-		this.id =3D id;
-		this.type =3D type;
+		this( entity, null, id, null, type );
 	}
 =

 	public Work(Class entityType, Serializable id, WorkType type) {
-		this.entityClass =3D entityType;
-		this.id =3D id;
-		this.type =3D type;
+		this( null, entityType, id, null, type );
 	}
 =

 	public Work(Object entity, XMember idGetter, WorkType type) {
+		this( entity, null, null, idGetter, type );
+	}
+	=

+	private Work(Object entity, Class entityClass, Serializable id,
+			XMember idGetter, WorkType type) {
 		this.entity =3D entity;
+		this.entityClass =3D entityClass;
+		this.id =3D id;
 		this.idGetter =3D idGetter;
 		this.type =3D type;
 	}
-	=

+
 	public Class getEntityClass() {
 		return entityClass;
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/=
MaskedProperty.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/Masked=
Property.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -28,8 +28,8 @@
 public class MaskedProperty extends Properties implements Serializable {
 	=

 	private static final long serialVersionUID =3D -593307257383085113L;
-	private static Logger log =3D LoggerFactory.getLogger( MaskedProperty.cla=
ss );
 	=

+	private final Logger log =3D LoggerFactory.getLogger( MaskedProperty.clas=
s );
 	private final Properties masked;
 	private final Properties fallBack;
 	private final String radix;

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQu=
eueingProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueing=
Processor.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -1,7 +1,6 @@
 //$Id$
 package org.hibernate.search.backend.impl;
 =

-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -148,7 +147,6 @@
 =

 	//TODO implements parallel batchWorkers (one per Directory)
 	public void performWorks(WorkQueue workQueue) {
-
 		Runnable processor =3D backendQueueProcessorFactory.getProcessor( workQu=
eue.getSealedQueue() );
 		if ( sync ) {
 			processor.run();
@@ -167,10 +165,10 @@
 		if ( executorService !=3D null && !executorService.isShutdown() ) {
 			executorService.shutdown();
 			try {
-				executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS );
+				executorService.awaitTermination( Long.MAX_VALUE, TimeUnit.SECONDS );
 			}
 			catch (InterruptedException e) {
-				log.error("Unable to property shut down asynchronous indexing work", e=
);
+				log.error( "Unable to properly shut down asynchronous indexing work", =
e );
 			}
 		}
 	}

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/PostTrans=
actionWorkQueueSynchronization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/PostTransaction=
WorkQueueSynchronization.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/PostTransaction=
WorkQueueSynchronization.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -10,14 +10,14 @@
 import org.hibernate.search.util.WeakIdentityHashMap;
 =

 /**
- * Execute some work inside a transaction sychronization
+ * Execute some work inside a transaction synchronization
  *
  * @author Emmanuel Bernard
  */
 public class PostTransactionWorkQueueSynchronization implements Synchroniz=
ation {
-	private QueueingProcessor queueingProcessor;
+	private final QueueingProcessor queueingProcessor;
 	private boolean consumed;
-	private WeakIdentityHashMap queuePerTransaction;
+	private final WeakIdentityHashMap queuePerTransaction;
 	private WorkQueue queue =3D new WorkQueue();
 =

 	/**

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/Transacti=
onalWorker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWo=
rker.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWo=
rker.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -23,7 +23,7 @@
  */
 public class TransactionalWorker implements Worker {
 	//not a synchronized map since for a given transaction, we have not concu=
rrent access
-	protected WeakIdentityHashMap synchronizationPerTransaction =3D new WeakI=
dentityHashMap();
+	protected final WeakIdentityHashMap synchronizationPerTransaction =3D new=
 WeakIdentityHashMap();
 	private QueueingProcessor queueingProcessor;
 =

 	public void performWork(Work work, EventSource session) {

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/Abstr=
actJMSHibernateSearchController.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -26,7 +26,7 @@
  * @author Emmanuel Bernard
  */
 public abstract class AbstractJMSHibernateSearchController implements Mess=
ageListener {
-	private static Logger log =3D LoggerFactory.getLogger( AbstractJMSHiberna=
teSearchController.class );
+	private static final Logger log =3D LoggerFactory.getLogger( AbstractJMSH=
ibernateSearchController.class );
 =

 	/**
 	 * return the current or give a new session
@@ -83,7 +83,7 @@
 	}
 =

 	private Runnable getWorker(List<LuceneWork> queue) {
-		//FIXME casting sucks becasue we do not control what get session from
+		//FIXME casting sucks because we do not control what get session from
 		Session session =3D getSession();
 		Runnable processor =3D null;
 =


Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/Lu=
ceneBackendQueueProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBa=
ckendQueueProcessor.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBa=
ckendQueueProcessor.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -32,10 +32,10 @@
 	/**
 	 * Class logger.
 	 */
-	private static Logger log =3D LoggerFactory.getLogger( LuceneBackendQueue=
Processor.class );
+	private static final Logger log =3D LoggerFactory.getLogger( LuceneBacken=
dQueueProcessor.class );
 	=

-	private List<LuceneWork> queue;
-	private SearchFactoryImplementor searchFactoryImplementor;
+	private final List<LuceneWork> queue;
+	private final SearchFactoryImplementor searchFactoryImplementor;
 =

 	public LuceneBackendQueueProcessor(List<LuceneWork> queue, SearchFactoryI=
mplementor searchFactoryImplementor) {
 		this.queue =3D queue;
@@ -70,7 +70,7 @@
 							work.getIdInString(),
 							work.getDocument()
 					);
-					queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload(work, provider=
) );
+					queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload( work, provide=
r ) );
 				}
 				else if ( DeleteLuceneWork.class.isAssignableFrom( work.getClass() ) )=
 {
 					DirectoryProvider[] providers =3D shardingStrategy.getDirectoryProvid=
ersForDeletion(
@@ -79,20 +79,20 @@
 							work.getIdInString()
 					);
 					for (DirectoryProvider provider : providers) {
-						queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload(work, provide=
r) );
+						queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload( work, provid=
er ) );
 					}
 				}
 				else if ( OptimizeLuceneWork.class.isAssignableFrom( work.getClass() )=
 ) {
 					DirectoryProvider[] providers =3D shardingStrategy.getDirectoryProvid=
ersForAllShards();
 					for (DirectoryProvider provider : providers) {
-						queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload(work, provide=
r) );
+						queueWithFlatDPs.add( new LuceneWorker.WorkWithPayload( work, provid=
er ) );
 					}
 				}
 				else {
 					throw new AssertionFailure( "Unknown work type: " + work.getClass() );
 				}
 			}
-			deadlockFreeQueue(queueWithFlatDPs, searchFactoryImplementor);
+			deadlockFreeQueue( queueWithFlatDPs, searchFactoryImplementor );
 			checkForBatchIndexing(workspace);		=

 			for ( LuceneWorker.WorkWithPayload luceneWork : queueWithFlatDPs ) {
 				worker.performWork( luceneWork );
@@ -107,9 +107,9 @@
 	private void checkForBatchIndexing(Workspace workspace) {
 		for ( LuceneWork luceneWork : queue ) {
 			// if there is at least a single batch index job we put the work space =
into batch indexing mode.
-			if(luceneWork.isBatch()){
-				log.trace("Setting batch indexing mode.");
-				workspace.setBatch(true);
+			if( luceneWork.isBatch() ){
+				log.trace( "Setting batch indexing mode." );
+				workspace.setBatch( true );
 				break;
 			}
 		}

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/Lu=
ceneWorker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWo=
rker.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneWo=
rker.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -30,7 +30,7 @@
  * @author John Griffin
  */
 public class LuceneWorker {
-	private Workspace workspace;
+	private final Workspace workspace;
 	private static final Logger log =3D LoggerFactory.getLogger( LuceneWorker=
.class );
 =

 	public LuceneWorker(Workspace workspace) {
@@ -145,16 +145,14 @@
 	}
 =

 	public static class WorkWithPayload {
-		private LuceneWork work;
-		private DirectoryProvider provider;
+		private final LuceneWork work;
+		private final DirectoryProvider provider;
 =

-
 		public WorkWithPayload(LuceneWork work, DirectoryProvider provider) {
 			this.work =3D work;
 			this.provider =3D provider;
 		}
 =

-
 		public LuceneWork getWork() {
 			return work;
 		}

Modified: search/trunk/src/java/org/hibernate/search/bridge/String2FieldBri=
dgeAdaptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAda=
ptor.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAda=
ptor.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -11,7 +11,7 @@
  * @author Emmanuel Bernard
  */
 public class String2FieldBridgeAdaptor implements FieldBridge {
-	private StringBridge stringBridge;
+	private final StringBridge stringBridge;
 =

 	public String2FieldBridgeAdaptor(StringBridge stringBridge) {
 		this.stringBridge =3D stringBridge;

Modified: search/trunk/src/java/org/hibernate/search/bridge/TwoWayString2Fi=
eldBridgeAdaptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/TwoWayString2FieldBri=
dgeAdaptor.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/bridge/TwoWayString2FieldBri=
dgeAdaptor.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -12,7 +12,7 @@
 //TODO use Generics to avoid double declaration of stringBridge =

 public class TwoWayString2FieldBridgeAdaptor extends String2FieldBridgeAda=
ptor implements TwoWayFieldBridge {
 =

-	private TwoWayStringBridge stringBridge;
+	private final TwoWayStringBridge stringBridge;
 =

 	public TwoWayString2FieldBridgeAdaptor(TwoWayStringBridge stringBridge) {
 		super( stringBridge );

Modified: search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBri=
dge.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.ja=
va	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/bridge/builtin/DateBridge.ja=
va	2008-05-29 15:18:15 UTC (rev 14713)
@@ -9,11 +9,8 @@
 import org.apache.lucene.document.DateTools;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
-import org.hibernate.search.bridge.StringBridge;
 import org.hibernate.search.bridge.ParameterizedBridge;
-import org.hibernate.search.bridge.String2FieldBridgeAdaptor;
 import org.hibernate.search.annotations.Resolution;
-import org.hibernate.search.bridge.TwoWayString2FieldBridgeAdaptor;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 import org.hibernate.util.StringHelper;
 =


Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentExtract=
or.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/DocumentExtractor.jav=
a	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentExtractor.jav=
a	2008-05-29 15:18:15 UTC (rev 14713)
@@ -1,14 +1,12 @@
 //$Id$
 package org.hibernate.search.engine;
 =

-import java.util.ArrayList;
-import java.util.List;
 import java.io.IOException;
+import java.io.Serializable;
 =

 import org.apache.lucene.document.Document;
 import org.apache.lucene.search.Hits;
 import org.hibernate.search.engine.EntityInfo;
-import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.ProjectionConstants;
 =

 /**
@@ -16,8 +14,8 @@
  * @author John Griffin
  */
 public class DocumentExtractor {
-	private SearchFactoryImplementor searchFactoryImplementor;
-	private String[] projection;
+	private final SearchFactoryImplementor searchFactoryImplementor;
+	private final String[] projection;
 =

 	public DocumentExtractor(SearchFactoryImplementor searchFactoryImplemento=
r, String... projection) {
 		this.searchFactoryImplementor =3D searchFactoryImplementor;
@@ -25,18 +23,19 @@
 	}
 =

 	private EntityInfo extract(Document document) {
-		EntityInfo entityInfo =3D new EntityInfo();
-		entityInfo.clazz =3D DocumentBuilder.getDocumentClass( document );
-		entityInfo.id =3D DocumentBuilder.getDocumentId( searchFactoryImplemento=
r, entityInfo.clazz, document );
+		Class clazz =3D DocumentBuilder.getDocumentClass( document );
+		Serializable id =3D DocumentBuilder.getDocumentId( searchFactoryImplemen=
tor, clazz, document );
+		Object[] projected =3D null;
 		if ( projection !=3D null && projection.length > 0 ) {
-			entityInfo.projection =3D DocumentBuilder.getDocumentFields( searchFact=
oryImplementor, entityInfo.clazz, document, projection );
+			projected =3D DocumentBuilder.getDocumentFields( searchFactoryImplement=
or, clazz, document, projection );
 		}
+		EntityInfo entityInfo =3D new EntityInfo( clazz, id, projected );
 		return entityInfo;
 	}
 =

 	public EntityInfo extract(Hits hits, int index) throws IOException {
 		Document doc =3D hits.doc( index );
-		//TODO if we are lonly looking for score (unlikely), avoid accessing doc=
 (lazy load)
+		//TODO if we are only looking for score (unlikely), avoid accessing doc =
(lazy load)
 		EntityInfo entityInfo =3D extract( doc );
 		Object[] eip =3D entityInfo.projection;
 =

@@ -60,9 +59,6 @@
 				else if ( ProjectionConstants.THIS.equals( projection[x] ) ) {
 					//THIS could be projected more than once
 					//THIS loading delayed to the Loader phase
-					if (entityInfo.indexesOfThis =3D=3D null) {
-						entityInfo.indexesOfThis =3D new ArrayList<Integer>(1);
-					}
 					entityInfo.indexesOfThis.add(x);
 				}
 			}

Modified: search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java	2008-=
05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/engine/EntityInfo.java	2008-=
05-29 15:18:15 UTC (rev 14713)
@@ -2,6 +2,7 @@
 package org.hibernate.search.engine;
 =

 import java.io.Serializable;
+import java.util.LinkedList;
 import java.util.List;
 =

 /**
@@ -10,8 +11,16 @@
  */
 //TODO Move to egine?
 public class EntityInfo {
-	public Class clazz;
-	public Serializable id;
-	public Object[] projection;
-	public List<Integer> indexesOfThis;
+	=

+	public final Class clazz;
+	public final Serializable id;
+	public final Object[] projection;
+	public final List<Integer> indexesOfThis =3D new LinkedList<Integer>();
+	=

+	public EntityInfo(Class clazz, Serializable id, Object[] projection) {
+		this.clazz =3D clazz;
+		this.id =3D id;
+		this.projection =3D projection;
+	}
+	=

 }

Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEve=
ntListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventList=
ener.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -18,8 +18,6 @@
 import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.impl.SearchFactoryImpl;
-import org.hibernate.search.Environment;
-import org.hibernate.search.SearchException;
 =

 /**
  * This listener supports setting a parent directory for all generated ind=
ex files.
@@ -63,7 +61,7 @@
 		if (used) {
 			final Object entity =3D event.getEntity();
 			DocumentBuilder<Object> builder =3D searchFactoryImplementor.getDocumen=
tBuilders().get( entity.getClass() );
-			//not strictly necessary but a smal optimization
+			//not strictly necessary but a small optimization
 			if ( builder !=3D null ) {
 				Serializable id =3D event.getId();
 				processWork( entity, id, WorkType.ADD, event );
@@ -74,7 +72,7 @@
 	public void onPostUpdate(PostUpdateEvent event) {
 		if (used) {
 			final Object entity =3D event.getEntity();
-			//not strictly necessary but a smal optimization
+			//not strictly necessary but a small optimization
 			DocumentBuilder<Object> builder =3D searchFactoryImplementor.getDocumen=
tBuilders().get( entity.getClass() );
 			if ( builder !=3D null ) {
 				Serializable id =3D event.getId();

Modified: search/trunk/src/java/org/hibernate/search/filter/ChainedFilter.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/filter/ChainedFilter.java	20=
08-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/filter/ChainedFilter.java	20=
08-05-29 15:18:15 UTC (rev 14713)
@@ -14,9 +14,10 @@
  * @author Emmanuel Bernard
  */
 public class ChainedFilter extends Filter {
-	private List<Filter> chainedFilters =3D new ArrayList<Filter>();
+	private static final long serialVersionUID =3D -6153052295766531920L;
+	=

+	private final List<Filter> chainedFilters =3D new ArrayList<Filter>();
 =

-
 	public void addFilter(Filter filter) {
 		this.chainedFilters.add( filter );
 	}
@@ -32,7 +33,6 @@
 		return result;
 	}
 =

-
 	public String toString() {
 		StringBuilder sb =3D new StringBuilder("ChainedFilter [");
 		for (Filter filter : chainedFilters) {

Modified: search/trunk/src/java/org/hibernate/search/filter/StandardFilterK=
ey.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/filter/StandardFilterKey.jav=
a	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/filter/StandardFilterKey.jav=
a	2008-05-29 15:18:15 UTC (rev 14713)
@@ -1,10 +1,6 @@
 // $Id$
 package org.hibernate.search.filter;
 =

-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 =

@@ -16,7 +12,7 @@
  * @author Emmanuel Bernard
  */
 public class StandardFilterKey extends FilterKey {
-	private List parameters =3D new ArrayList();
+	private final List parameters =3D new ArrayList();
 	private boolean implSet;
 =

 =


Modified: search/trunk/src/java/org/hibernate/search/impl/FullTextSessionIm=
pl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.jav=
a	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.jav=
a	2008-05-29 15:18:15 UTC (rev 14713)
@@ -7,8 +7,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 =

 import org.hibernate.CacheMode;
 import org.hibernate.Criteria;
@@ -45,7 +43,6 @@
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.SearchFactory;
-import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.Work;
 import org.hibernate.search.backend.WorkType;
 import org.hibernate.search.engine.DocumentBuilder;

Modified: search/trunk/src/java/org/hibernate/search/impl/InitContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/InitContext.java	2008-0=
5-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/impl/InitContext.java	2008-0=
5-29 15:18:15 UTC (rev 14713)
@@ -27,8 +27,8 @@
  * @author Emmanuel Bernard
  */
 public class InitContext {
-	private Map<String, AnalyzerDef> analyzerDefs =3D new HashMap<String, Ana=
lyzerDef>();
-	private List<DelegateNamedAnalyzer> lazyAnalyzers =3D new ArrayList<Deleg=
ateNamedAnalyzer>();
+	private final Map<String, AnalyzerDef> analyzerDefs =3D new HashMap<Strin=
g, AnalyzerDef>();
+	private final List<DelegateNamedAnalyzer> lazyAnalyzers =3D new ArrayList=
<DelegateNamedAnalyzer>();
 	private final Analyzer defaultAnalyzer;
 	private final Similarity defaultSimilarity;
 =

@@ -57,7 +57,7 @@
 	}
 =

 	/**
-	 * Initilises the Lucene analyzer to use by reading the analyzer class fr=
om the configuration and instantiating it.
+	 * Initializes the Lucene analyzer to use by reading the analyzer class f=
rom the configuration and instantiating it.
 	 *
 	 * @param cfg
 	 *            The current configuration.
@@ -91,7 +91,7 @@
 	}
 =

 	/**
-	 * Initilises the Lucene similarity to use
+	 * Initializes the Lucene similarity to use
 	 */
 	private Similarity initSimilarity(Configuration cfg) {
 		Class similarityClass;

Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-29 15:18:15 UTC (rev 14713)
@@ -51,25 +51,25 @@
  * @author Emmanuel Bernard
  */
 public class SearchFactoryImpl implements SearchFactoryImplementor {
-	private static ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>>=
 contexts =3D
+	private static final ThreadLocal<WeakHashMap<Configuration, SearchFactory=
Impl>> contexts =3D
 			new ThreadLocal<WeakHashMap<Configuration, SearchFactoryImpl>>();
 =

 	static {
 		Version.touch();
 	}
 =

-	private final Logger log =3D LoggerFactory.getLogger( SearchFactoryImpl.c=
lass );
+	private static final Logger log =3D LoggerFactory.getLogger( SearchFactor=
yImpl.class );
 =

-	private Map<Class, DocumentBuilder<Object>> documentBuilders =3D new Hash=
Map<Class, DocumentBuilder<Object>>();
+	private final Map<Class, DocumentBuilder<Object>> documentBuilders =3D ne=
w HashMap<Class, DocumentBuilder<Object>>();
 	//keep track of the index modifiers per DirectoryProvider since multiple =
entity can use the same directory provider
-	private Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders =
=3D
+	private final Map<DirectoryProvider, ReentrantLock> lockableDirectoryProv=
iders =3D
 			new HashMap<DirectoryProvider, ReentrantLock>();
-	private Map<DirectoryProvider, OptimizerStrategy> dirProviderOptimizerStr=
ategies =3D
+	private final Map<DirectoryProvider, OptimizerStrategy> dirProviderOptimi=
zerStrategies =3D
 			new HashMap<DirectoryProvider, OptimizerStrategy>();
 	private Worker worker;
 	private ReaderProvider readerProvider;
 	private BackendQueueProcessorFactory backendQueueProcessorFactory;
-	private Map<String, FilterDef> filterDefinitions =3D new HashMap<String, =
FilterDef>();
+	private final Map<String, FilterDef> filterDefinitions =3D new HashMap<St=
ring, FilterDef>();
 	private FilterCachingStrategy filterCachingStrategy;
 	private Map<String, Analyzer> analyzers;
 	private boolean stopped =3D false;

Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntit=
yManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManag=
erImpl.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManag=
erImpl.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -20,7 +20,7 @@
  * @author Emmanuel Bernard
  */
 public class FullTextEntityManagerImpl implements FullTextEntityManager, S=
erializable {
-	private EntityManager em;
+	private final EntityManager em;
 	private FullTextSession ftSession;
 =

 	public FullTextEntityManagerImpl(EntityManager em) {

Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQuery=
Impl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.j=
ava	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.j=
ava	2008-05-29 15:18:15 UTC (rev 14713)
@@ -42,7 +42,7 @@
  */
 public class FullTextQueryImpl implements FullTextQuery {
 	private final org.hibernate.search.FullTextQuery query;
-	private Session session;
+	private final Session session;
 =

 	public FullTextQueryImpl(org.hibernate.search.FullTextQuery query, Sessio=
n session) {
 		this.query =3D query;
@@ -91,11 +91,11 @@
 			return query.list();
 		}
 		catch (QueryExecutionRequestException he) {
-			//TODO when an illegal state exceptio should be raised?
+			//TODO when an illegal state exception should be raised?
 			throw new IllegalStateException(he);
 		}
 		catch( TypeMismatchException e ) {
-			//TODO when an illegal arg exceptio should be raised?
+			//TODO when an illegal arg exception should be raised?
 			throw new IllegalArgumentException(e);
 		}
 		catch (SearchException he) {

Modified: search/trunk/src/java/org/hibernate/search/query/FullTextFilterIm=
pl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/FullTextFilterImpl.jav=
a	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextFilterImpl.jav=
a	2008-05-29 15:18:15 UTC (rev 14713)
@@ -10,7 +10,7 @@
  * @author Emmanuel Bernard
  */
 public class FullTextFilterImpl implements FullTextFilter {
-	private Map<String, Object> parameters =3D new HashMap<String, Object>();
+	private final Map<String, Object> parameters =3D new HashMap<String, Obje=
ct>();
 	private String name;
 =

 	public void setName(String name) {

Modified: search/trunk/src/java/org/hibernate/search/query/IteratorImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/IteratorImpl.java	2008=
-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/query/IteratorImpl.java	2008=
-05-29 15:18:15 UTC (rev 14713)
@@ -19,7 +19,7 @@
 	private final int size;
 	private Object next;
 	private int nextObjectIndex =3D -1;
-	private Loader loader;
+	private final Loader loader;
 =

 	public IteratorImpl(List<EntityInfo> entityInfos, Loader loader) {
 		this.entityInfos =3D entityInfos;
@@ -58,7 +58,7 @@
 	}
 =

 	public void remove() {
-		//TODO this is theorically doable
+		//TODO this is theoretically doable
 		throw new UnsupportedOperationException( "Cannot remove from a lucene qu=
ery iterator" );
 	}
 }

Modified: search/trunk/src/java/org/hibernate/search/query/ScrollableResult=
sImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.=
java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/query/ScrollableResultsImpl.=
java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -50,7 +50,7 @@
  * @author John Griffin
  */
 public class ScrollableResultsImpl implements ScrollableResults {
-	private static Logger log =3D LoggerFactory.getLogger( ScrollableResultsI=
mpl.class );
+	private static final Logger log =3D LoggerFactory.getLogger( ScrollableRe=
sultsImpl.class );
 	private final IndexSearcher searcher;
 	private final SearchFactory searchFactory;
 	private final Hits hits;
@@ -58,10 +58,10 @@
 	private final int max;
 	private final int fetchSize;
 	private int current;
-	private EntityInfo[] entityInfos;
-	private Loader loader;
-	private DocumentExtractor documentExtractor;
-	private Map<EntityInfo, Object[]> resultContext;
+	private final EntityInfo[] entityInfos;
+	private final Loader loader;
+	private final DocumentExtractor documentExtractor;
+	private final Map<EntityInfo, Object[]> resultContext;
 =

 	public ScrollableResultsImpl(
 			IndexSearcher searcher, Hits hits, int first, int max, int fetchSize, D=
ocumentExtractor extractor,

Modified: search/trunk/src/java/org/hibernate/search/reader/CacheableMultiR=
eader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.=
java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.=
java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -16,7 +16,7 @@
 =

 	// This is package private as the intention of the Lucene team seems to b=
e to not =

 	// expose this publically (it's a protected member in Lucene 2.3)
-	IndexReader[] subReaders;
+	final IndexReader[] subReaders;
 =

 	public CacheableMultiReader(IndexReader[] subReaders) throws IOException {
 		super( subReaders );

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -45,7 +45,7 @@
  */
 public class DirectoryProviderFactory {
 	=

-	private List<DirectoryProvider<?>> providers =3D new ArrayList<DirectoryP=
rovider<?>>();
+	private final List<DirectoryProvider<?>> providers =3D new ArrayList<Dire=
ctoryProvider<?>>();
 	private static String DEFAULT_DIRECTORY_PROVIDER =3D FSDirectoryProvider.=
class.getName();
 	=

 	private static final String SHARDING_STRATEGY =3D "sharding_strategy";
@@ -252,8 +252,8 @@
 	}
 =

 	public class DirectoryProviders {
-		private IndexShardingStrategy shardingStrategy;
-		private DirectoryProvider[] providers;
+		private final IndexShardingStrategy shardingStrategy;
+		private final DirectoryProvider[] providers;
 =

 		public DirectoryProviders(IndexShardingStrategy shardingStrategy, Direct=
oryProvider[] providers) {
 			this.shardingStrategy =3D shardingStrategy;

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -59,7 +59,7 @@
 			makeSanityCheckedDirectory( rootDir, directoryProviderName, needWritePe=
rmissions );
 			sourceDirectory =3D new File( root, relative );
 			makeSanityCheckedDirectory( sourceDirectory, directoryProviderName, nee=
dWritePermissions );
-			log.debug( "Get directory from root + relative" );
+			log.debug( "Got directory from root + relative" );
 		}
 		return sourceDirectory;
 	}

Modified: search/trunk/src/test/org/hibernate/search/test/bridge/Unresolved=
BridgeTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/bridge/UnresolvedBridge=
Test.java	2008-05-29 15:14:13 UTC (rev 14712)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/UnresolvedBridge=
Test.java	2008-05-29 15:18:15 UTC (rev 14713)
@@ -1,19 +1,11 @@
 //$Id$
 package org.hibernate.search.test.bridge;
 =

-import java.io.InputStream;
-
-import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.cfg.Configuration;
 import junit.framework.TestCase;
 =

-
 /**
  * @author Emmanuel Bernard
  */


--===============2092859432004210239==--

From hibernate-commits at lists.jboss.org Thu May 29 18:07:57 2008
Content-Type: multipart/mixed; boundary="===============2120633280021930222=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14714 - in
 search/trunk/src/java/org/hibernate/search: engine and 1 other directory.
Date: Thu, 29 May 2008 18:07:57 -0400
Message-ID: <E1K1qHt-0000CM-5f@committer01.frg.pub.inap.atl.jboss.com>

--===============2120633280021930222==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-29 18:07:56 -0400 (Thu, 29 May 2008)
New Revision: 14714

Modified:
   search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParamet=
ers.java
   search/trunk/src/java/org/hibernate/search/backend/Workspace.java
   search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
Log:
HSEARCH-202 and more optimizations in Workspace (early lock releases)

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexing=
Parameters.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-29 15:18:15 UTC (rev 14713)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParame=
ters.java	2008-05-29 22:07:56 UTC (rev 14714)
@@ -129,4 +129,13 @@
 =

  	}
 =

+	public void applyToWriter(IndexWriter writer, boolean batch) {
+		if ( batch ) {
+			getBatchIndexParameters().applyToWriter( writer );
+		}
+		else {
+			getTransactionIndexParameters().applyToWriter( writer );
+		}
+	}
+
 }

Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-29 15:18:15 UTC (rev 14713)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-29 22:07:56 UTC (rev 14714)
@@ -2,9 +2,7 @@
 package org.hibernate.search.backend;
 =

 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 =

@@ -12,6 +10,7 @@
 import org.apache.lucene.analysis.SimpleAnalyzer;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.store.Directory;
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.DocumentBuilder;
@@ -30,7 +29,7 @@
  * <li>One cannot execute modification through an IndexReader when an Inde=
xWriter has been acquired
  * on the same underlying directory
  * </li>
- * <li>One cannot get an IndexWriter when an IndexReader have been acquire=
d and modificed on the same
+ * <li>One cannot get an IndexWriter when an IndexReader have been acquire=
d and modified on the same
  * underlying directory
  * </li>
  * <li>The recommended approach is to execute all the modifications on the=
 IndexReaders, {@link #clean()}, and acquire the
@@ -40,22 +39,35 @@
  *
  * @author Emmanuel Bernard
  * @author Hardy Ferentschik
+ * @author Sanne Grinovero
  */
-//TODO introduce the notion of read only IndexReader? We cannot enforce it=
 because Lucene use abstract classes, not interfaces
+//TODO introduce the notion of read only IndexReader? We cannot enforce it=
 because Lucene uses abstract classes, not interfaces.
 public class Workspace {
+	=

 	private final Logger log =3D LoggerFactory.getLogger( Workspace.class );
-	private Map<DirectoryProvider, IndexReader> readers =3D new HashMap<Direc=
toryProvider, IndexReader>();
-	private Map<DirectoryProvider, IndexWriter> writers =3D new HashMap<Direc=
toryProvider, IndexWriter>();
-	private List<DirectoryProvider> lockedProviders =3D new ArrayList<Directo=
ryProvider>();
-	private Map<DirectoryProvider, DPStatistics> dpStatistics =3D new HashMap=
<DirectoryProvider, DPStatistics>();
-	private SearchFactoryImplementor searchFactoryImplementor;
+	private final SearchFactoryImplementor searchFactoryImplementor;
+	private static final Analyzer SIMPLE_ANALYZER =3D new SimpleAnalyzer();
+	private final Map<DirectoryProvider, DPWorkspace> directorySpace =3D new =
HashMap<DirectoryProvider, DPWorkspace>() {
 =

+		@Override
+		public DPWorkspace get(Object key) {
+			DirectoryProvider dp =3D (DirectoryProvider) key;
+			DPWorkspace directoryWorkSpace =3D super.get( dp );
+			if ( directoryWorkSpace=3D=3Dnull ) {
+				directoryWorkSpace =3D new DPWorkspace( dp );
+				put( dp, directoryWorkSpace );
+			}
+			return directoryWorkSpace;
+		}
+		=

+	};
+	=

 	/**
-	 * Flag indicating if the current work should be executed the Lucene para=
meters for batch indexing.
+	 * Flag indicating if the current work should be executed using
+	 * the Lucene parameters for batch indexing.
 	 */
 	private boolean isBatch =3D false;
 =

-
 	public Workspace(SearchFactoryImplementor searchFactoryImplementor) {
 		this.searchFactoryImplementor =3D searchFactoryImplementor;
 	}
@@ -65,29 +77,16 @@
 	}
 =

 	/**
-	 * retrieve a read write IndexReader
+	 * Retrieve a read write IndexReader; the purpose should be to
+	 * modify the index. (mod count will be incremented)
 	 * For a given DirectoryProvider, An IndexReader must be used before an I=
ndexWriter
 	 */
-	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public IndexReader getIndexReader(DirectoryProvider provider, Class entit=
y) {
-		//one cannot access a reader for update after a writer has been accessed
-		if ( writers.containsKey( provider ) )
-			throw new AssertionFailure( "Tries to read for update an index while a =
writer is accessed" + entity );
-		IndexReader reader =3D readers.get( provider );
-		if ( reader !=3D null ) return reader;
-		lockProvider( provider );
-		dpStatistics.get( provider ).operations++;
-		try {
-			reader =3D IndexReader.open( provider.getDirectory() );
-			readers.put( provider, reader );
-		}
-		catch (IOException e) {
-			cleanUp( new SearchException( "Unable to open IndexReader for " + entit=
y, e ) );
-		}
-		return reader;
+		DPWorkspace space =3D directorySpace.get( provider );
+		return space.getIndexReader( entity );
 	}
 =

-	//for optimization
+	//for index optimization
 	public IndexWriter getIndexWriter(DirectoryProvider provider) {
 		return getIndexWriter( provider, null, false );
 	}
@@ -96,66 +95,17 @@
 	 * retrieve a read write IndexWriter
 	 * For a given DirectoryProvider, An IndexReader must be used before an I=
ndexWriter
 	 */
-	@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
 	public IndexWriter getIndexWriter(DirectoryProvider provider, Class entit=
y, boolean modificationOperation) {
-		//one has to close a reader for update before a writer is accessed
-		IndexReader reader =3D readers.get( provider );
-		if ( reader !=3D null ) {
-			try {
-				reader.close();
-			}
-			catch (IOException e) {
-				throw new SearchException( "Exception while closing IndexReader", e );
-			}
-			readers.remove( provider );
-		}
-		IndexWriter writer =3D writers.get( provider );
-		if ( writer !=3D null ) return writer;
-		lockProvider( provider );
-		if ( modificationOperation ) dpStatistics.get( provider ).operations++;
-		try {
-			DocumentBuilder documentBuilder =3D searchFactoryImplementor.getDocumen=
tBuilders().get( entity );
-			Analyzer analyzer =3D entity !=3D null ?
-					documentBuilder.getAnalyzer() :
-					new SimpleAnalyzer(); //never used
-			writer =3D new IndexWriter( provider.getDirectory(), analyzer, false );=
 //has been created at init time
-			writer.setSimilarity( documentBuilder.getSimilarity() );
-
-			LuceneIndexingParameters indexingParams =3D searchFactoryImplementor.ge=
tIndexingParameters( provider );
-			if ( isBatch ) {
-				indexingParams.getBatchIndexParameters().applyToWriter(writer);
-			}
-			else {
-				indexingParams.getTransactionIndexParameters().applyToWriter(writer);
-			}
-
-			writers.put( provider, writer );
-		}
-		catch (IOException e) {
-			cleanUp(
-					new SearchException( "Unable to open IndexWriter" + ( entity !=3D nul=
l ? " for " + entity : "" ), e )
-			);
-		}
-		return writer;
+		DPWorkspace space =3D directorySpace.get( provider );
+		return space.getIndexWriter( entity, modificationOperation );
 	}
 =

-	private void lockProvider(DirectoryProvider provider) {
-		//make sure to use a semaphore
-		ReentrantLock lock =3D searchFactoryImplementor.getLockableDirectoryProv=
iders().get( provider );
-		//of course a given thread cannot have a race cond with itself
-		if ( !lock.isHeldByCurrentThread() ) {
-			lock.lock();
-			lockedProviders.add( provider );
-			dpStatistics.put( provider, new DPStatistics() );
-		}
-	}
-
 	private void cleanUp(SearchException originalException) {
 		//release all readers and writers, then release locks
 		SearchException raisedException =3D originalException;
-		for (IndexReader reader : readers.values()) {
+		for ( DPWorkspace space : directorySpace.values() ) {
 			try {
-				reader.close();
+				space.closeIndexReader();
 			}
 			catch (IOException e) {
 				if ( raisedException !=3D null ) {
@@ -166,46 +116,47 @@
 				}
 			}
 		}
-		readers.clear();
-		//TODO release lock of all indexes that do not need optimization early
-		//don't optimze if there is a failure
-		if ( raisedException =3D=3D null ) {
-			for (DirectoryProvider provider : lockedProviders) {
-				Workspace.DPStatistics stats =3D dpStatistics.get( provider );
-				if ( !stats.optimizationForced ) {
-					OptimizerStrategy optimizerStrategy =3D searchFactoryImplementor.getO=
ptimizerStrategy( provider );
-					optimizerStrategy.addTransaction( stats.operations );
+		//first release all locks for DirectoryProviders not needing optimization
+		for ( DPWorkspace space : directorySpace.values() ) {
+			if ( ! space.needsOptimization() ) {
+				raisedException =3D closeWriterAndUnlock( space, raisedException );
+			}
+		}
+		//then for remaining DirectoryProvider
+		for ( DPWorkspace space : directorySpace.values() ) {
+			if ( space.needsOptimization() ) {
+				if ( raisedException =3D=3D null ) {//avoid optimizations in case of e=
rrors or exceptions
+					OptimizerStrategy optimizerStrategy =3D space.getOptimizerStrategy();
+					optimizerStrategy.addTransaction( space.countOperations() );
 					try {
 						optimizerStrategy.optimize( this );
 					}
 					catch (SearchException e) {
+						//this will also cause skipping other optimizations:
 						raisedException =3D new SearchException( "Exception while optimizing=
 directoryProvider: "
-								+ provider.getDirectory().toString(), e );
-						break; //no point in continuing
+								+ space.getDirectory().toString(), e );
 					}
 				}
+				raisedException =3D closeWriterAndUnlock( space, raisedException );
 			}
 		}
-		for (IndexWriter writer : writers.values()) {
-			try {
-				writer.close();
+		if ( raisedException !=3D null ) throw raisedException;
+	}
+
+	private SearchException closeWriterAndUnlock( DPWorkspace space, SearchEx=
ception raisedException ) {
+		try {
+			space.closeIndexWriter();
+		}
+		catch (IOException e) {
+			if ( raisedException !=3D null ) {
+				log.error( "Subsequent Exception while closing IndexWriter", e );
 			}
-			catch (IOException e) {
-				if ( raisedException !=3D null ) {
-					log.error( "Subsequent Exception while closing IndexWriter", e );
-				}
-				else {
-					raisedException =3D new SearchException( "Exception while closing Ind=
exWriter", e );
-				}
+			else {
+				raisedException =3D new SearchException( "Exception while closing Inde=
xWriter", e );
 			}
 		}
-		for (DirectoryProvider provider : lockedProviders) {
-			searchFactoryImplementor.getLockableDirectoryProviders().get( provider =
).unlock();
-		}
-		writers.clear();
-		lockedProviders.clear();
-		dpStatistics.clear();
-		if ( raisedException !=3D null ) throw raisedException;
+		space.unLock();
+		return raisedException;
 	}
 =

 	/**
@@ -216,16 +167,12 @@
 	}
 =

 	public void optimize(DirectoryProvider provider) {
-		OptimizerStrategy optimizerStrategy =3D searchFactoryImplementor.getOpti=
mizerStrategy( provider );
-		dpStatistics.get( provider ).optimizationForced =3D true;
+		DPWorkspace space =3D directorySpace.get( provider );
+		OptimizerStrategy optimizerStrategy =3D space.getOptimizerStrategy();
+		space.setOptimizationForced();
 		optimizerStrategy.optimizationForced();
 	}
 =

-	private class DPStatistics {
-		boolean optimizationForced =3D false;
-		public long operations;
-	}
-
 	public boolean isBatch() {
 		return isBatch;
 	}
@@ -233,4 +180,180 @@
 	public void setBatch(boolean isBatch) {
 		this.isBatch =3D isBatch;
 	}
+	=

+	//TODO this should have it's own source file but currently needs the cont=
ainer-Workspace cleanup()
+	//for exceptions. Best to wait for move to parallel batchWorkers (one per=
 Directory)?
+	/**
+	 * A per-DirectoryProvider Workspace
+	 */
+	private class DPWorkspace {
+		=

+		private final DirectoryProvider directoryProvider;
+		private final ReentrantLock lock;
+		=

+		private IndexReader reader;
+		private IndexWriter writer;
+		private boolean locked =3D false;
+		private boolean optimizationForced =3D false;
+		private long operations =3D 0L;
+		=

+		DPWorkspace(DirectoryProvider dp) {
+			this.directoryProvider =3D dp;
+			this.lock =3D searchFactoryImplementor.getLockableDirectoryProviders().=
get( dp );
+		}
+		=

+		public boolean needsOptimization() {
+			return isLocked() && !isOptimizationForced();
+		}
+
+		/**
+		 * Sets a flag to signal optimization has been forced.
+		 * Cannot be undone.
+		 */
+		void setOptimizationForced() {
+			optimizationForced =3D true;			=

+		}
+
+		/**
+		 * @return the Directory from the DirectoryProvider
+		 */
+		Directory getDirectory() {
+			return directoryProvider.getDirectory();
+		}
+
+		/**
+		 * @return A count of performed modification operations
+		 */
+		long countOperations() {
+			return operations;
+		}
+
+		/**
+		 * @return The OptimizerStrategy configured for this DirectoryProvider
+		 */
+		OptimizerStrategy getOptimizerStrategy() {
+			return searchFactoryImplementor.getOptimizerStrategy( directoryProvider=
 );
+		}
+
+		/**
+		 * @return true if optimization has been forced
+		 */
+		boolean isOptimizationForced() {
+			return optimizationForced;
+		}
+
+		/**
+		 * @return true if underlying DirectoryProvider is locked
+		 */
+		boolean isLocked() {
+			return locked;
+		}
+
+		/**
+		 * Gets the currently open IndexWriter, or creates one.
+		 * If a IndexReader was open, it will be closed first.
+		 * @param entity The entity for which the IndexWriter is needed
+		 * @param modificationOperation set to true if needed to perform modific=
ations to index
+		 * @return created or existing IndexWriter
+		 */
+		IndexWriter getIndexWriter(Class entity, boolean modificationOperation) {
+			//one has to close a reader for update before a writer is accessed
+			try {
+				closeIndexReader();
+			}
+			catch (IOException e) {
+				throw new SearchException( "Exception while closing IndexReader", e );
+			}
+			if ( modificationOperation ) {
+				operations++; //estimate the number of modifications done on this index
+			}
+			if ( writer !=3D null ) return writer;
+			lock();
+			try {
+				DocumentBuilder documentBuilder =3D searchFactoryImplementor.getDocume=
ntBuilders().get( entity );
+				Analyzer analyzer =3D entity !=3D null ?
+						documentBuilder.getAnalyzer() :
+						SIMPLE_ANALYZER; //never used
+				writer =3D new IndexWriter( directoryProvider.getDirectory(), analyzer=
, false ); //has been created at init time
+				writer.setSimilarity( documentBuilder.getSimilarity() );
+				LuceneIndexingParameters indexingParams =3D searchFactoryImplementor.g=
etIndexingParameters( directoryProvider );
+				indexingParams.applyToWriter( writer, isBatch );
+			}
+			catch (IOException e) {
+				cleanUp(
+						new SearchException( "Unable to open IndexWriter" + ( entity !=3D nu=
ll ? " for " + entity : "" ), e )
+				);
+			}
+			return writer;
+		}
+
+		/**
+		 * Gets an IndexReader to alter the index;
+		 * (operations count will be incremented)
+		 * @throws AssertionFailure if an IndexWriter is open
+		 * @param entity The entity for which the IndexWriter is needed
+		 * @return a new or existing IndexReader
+		 */
+		IndexReader getIndexReader(Class entity) {
+			//one cannot access a reader for update after a writer has been accessed
+			if ( writer !=3D null )
+				throw new AssertionFailure( "Tries to read for update an index while a=
 writer is accessed for " + entity );
+			operations++; //estimate the number of modifications done on this index
+			if ( reader !=3D null ) return reader;
+			lock();
+			try {
+				reader =3D IndexReader.open( directoryProvider.getDirectory() );
+			}
+			catch (IOException e) {
+				cleanUp( new SearchException( "Unable to open IndexReader for " + enti=
ty, e ) );
+			}
+			return reader;
+		}
+
+		/**
+		 * Unlocks underlying DirectoryProvider iff locked.
+		 */
+		void unLock() {
+			if ( locked ) {
+				lock.unlock();
+				locked =3D false;
+			}
+		}
+		=

+		/**
+		 * Locks underlying DirectoryProvider iff not locked already.
+		 */
+		void lock() {
+			if ( !locked ) {
+				lock.lock();
+				locked =3D true;
+			}
+		}
+
+		/**
+		 * Closes the IndexReader, if open.
+		 * @throws IOException
+		 */
+		void closeIndexReader() throws IOException {
+			IndexReader toClose =3D reader;
+			reader =3D null;
+			if ( toClose!=3Dnull ) {
+				toClose.close();
+			}
+		}
+		=

+		/**
+		 * Closes the IndexWriter, if open.
+		 * @throws IOException
+		 */
+		void closeIndexWriter() throws IOException {
+			IndexWriter toClose =3D writer;
+			writer =3D null;
+			if ( toClose!=3Dnull ) {
+				toClose.close();
+			}
+		}
+		=

+	}
+	=

 }

Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-29 15:18:15 UTC (rev 14713)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java	=
2008-05-29 22:07:56 UTC (rev 14714)
@@ -66,7 +66,7 @@
 public class DocumentBuilder<T> {
 	private static final Logger log =3D LoggerFactory.getLogger( DocumentBuil=
der.class );
 =

-	private final PropertiesMetadata rootPropertiesMetadata;
+	private final PropertiesMetadata rootPropertiesMetadata =3D new Propertie=
sMetadata();
 	private final XClass beanClass;
 	private final DirectoryProvider[] directoryProviders;
 	private final IndexShardingStrategy shardingStrategy;
@@ -79,13 +79,12 @@
 	private ReflectionManager reflectionManager;
 	private int level =3D 0;
 	private int maxLevel =3D Integer.MAX_VALUE;
-	private ScopedAnalyzer analyzer;
+	private final ScopedAnalyzer analyzer =3D new ScopedAnalyzer();
 	private Similarity similarity;
 =

 =

 	public DocumentBuilder(XClass clazz, InitContext context, DirectoryProvid=
er[] directoryProviders,
 						   IndexShardingStrategy shardingStrategy, ReflectionManager reflect=
ionManager) {
-		this.analyzer =3D new ScopedAnalyzer();
 		this.beanClass =3D clazz;
 		this.directoryProviders =3D directoryProviders;
 		this.shardingStrategy =3D shardingStrategy;
@@ -94,7 +93,6 @@
 		this.similarity =3D context.getDefaultSimilarity();
 =

 		if ( clazz =3D=3D null ) throw new AssertionFailure( "Unable to build a =
DocumentBuilder with a null class" );
-		rootPropertiesMetadata =3D new PropertiesMetadata();
 		rootPropertiesMetadata.boost =3D getBoost( clazz );
 		rootPropertiesMetadata.analyzer =3D context.getDefaultAnalyzer();
 		Set<XClass> processedClasses =3D new HashSet<XClass>();


--===============2120633280021930222==--

From hibernate-commits at lists.jboss.org Fri May 30 10:50:48 2008
Content-Type: multipart/mixed; boundary="===============4560478187330065818=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14715 -
 search/trunk/src/java/org/hibernate/search/backend.
Date: Fri, 30 May 2008 10:50:48 -0400
Message-ID: <E1K25wO-0003P1-0h@committer01.frg.pub.inap.atl.jboss.com>

--===============4560478187330065818==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-30 10:50:47 -0400 (Fri, 30 May 2008)
New Revision: 14715

Modified:
   search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java
   search/trunk/src/java/org/hibernate/search/backend/WorkQueue.java
Log:
Clarify the need for Serializability in LuceneWork

Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java	2008=
-05-29 22:07:56 UTC (rev 14714)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneWork.java	2008=
-05-30 14:50:47 UTC (rev 14715)
@@ -8,6 +8,13 @@
 /**
  * Represent a Serializable Lucene unit work
  *
+ * WARNING: This class aims to be serializable and passed in an asynchrono=
us way across VMs
+ *          any non backward compatible serialization change should be don=
e with great care
+ *          and publically announced. Specifically, new versions of Hibern=
ate Search should be
+ *          able to handle changes produced by older versions of Hibernate=
 Search if reasonably possible.
+ *          That is why each subclass susceptible to be pass along have a =
magic serialization number.
+ *          NOTE: we are relying on Lucene's Document to play nice unfortu=
nately
+ *
  * @author Emmanuel Bernard
  * @author Hardy Ferentschik
  */

Modified: search/trunk/src/java/org/hibernate/search/backend/WorkQueue.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/WorkQueue.java	2008-=
05-29 22:07:56 UTC (rev 14714)
+++ search/trunk/src/java/org/hibernate/search/backend/WorkQueue.java	2008-=
05-30 14:50:47 UTC (rev 14715)
@@ -10,7 +10,6 @@
  * @author Emmanuel Bernard
  */
 public class WorkQueue {
-	//TODO set a serial number
 	private List<Work> queue;
 =

 	private List<LuceneWork> sealedQueue;


--===============4560478187330065818==--

From hibernate-commits at lists.jboss.org Fri May 30 11:49:58 2008
Content-Type: multipart/mixed; boundary="===============7355989081049168304=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14716 - in
 search/trunk/src/java/org/hibernate/search: backend/configuration and 2 other
 directories.
Date: Fri, 30 May 2008 11:49:58 -0400
Message-ID: <E1K26re-0007zj-JK@committer01.frg.pub.inap.atl.jboss.com>

--===============7355989081049168304==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sannegrinovero
Date: 2008-05-30 11:49:57 -0400 (Fri, 30 May 2008)
New Revision: 14716

Modified:
   search/trunk/src/java/org/hibernate/search/annotations/ContainedIn.java
   search/trunk/src/java/org/hibernate/search/annotations/Factory.java
   search/trunk/src/java/org/hibernate/search/annotations/Key.java
   search/trunk/src/java/org/hibernate/search/backend/configuration/IndexWr=
iterSetting.java
   search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMSH=
ibernateSearchController.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper=
.java
Log:
javadoc: fix some warnings and formatting

Modified: search/trunk/src/java/org/hibernate/search/annotations/ContainedI=
n.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/annotations/ContainedIn.java=
	2008-05-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/annotations/ContainedIn.java=
	2008-05-30 15:49:57 UTC (rev 14716)
@@ -9,28 +9,29 @@
 =

 /**
  * Describe the owning entity as being part of the target entity's
- * index (to be more accurate, being part of the indexed object graph)
- *
- * Only necessary when an @Indexed class is used as a @IndexedEmbedded
- * target class. @ContainedIn must mark the property pointing back
- * to the @IndexedEmbedded owning Entity
- *
- * Not necessary if the class is an @Embeddable class.
- *
+ * index (to be more accurate, being part of the indexed object graph).
+ * <p>
+ * Only necessary when an &#64;Indexed class is used as a &#64;IndexedEmbe=
dded
+ * target class. &#64;ContainedIn must mark the property pointing back
+ * to the &#64;IndexedEmbedded owning Entity.
+ * <p>
+ * Not necessary if the class is an &#64;Embeddable class.
+ * <p>
  * <code>
- * @Indexed
- * public class OrderLine {
- *     @IndexedEmbedded
- *     private Order order;
- * }
- *
- * @Indexed
- * public class Order {
- *     @ContainedBy
- *     Set<OrderLine> lines;
- * }
- * </code>
- *
+ * &#64;Indexed<br>
+ * public class OrderLine {<br>
+ *     &#64;IndexedEmbedded<br>
+ *     private Order order;<br>
+ * }<br>
+ *<br>
+ * &#64;Indexed<br>
+ * public class Order {<br>
+ *     &#64;ContainedBy<br>
+ *     Set<OrderLine> lines;<br>
+ * }<br>
+ * </code><br>
+ * @see org.hibernate.search.annotations.Indexed
+ * @see org.hibernate.search.annotations.IndexedEmbedded
  * @author Emmanuel Bernard
  */
 @Retention( RetentionPolicy.RUNTIME )

Modified: search/trunk/src/java/org/hibernate/search/annotations/Factory.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/annotations/Factory.java	200=
8-05-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/annotations/Factory.java	200=
8-05-30 15:49:57 UTC (rev 14716)
@@ -12,9 +12,9 @@
  * A factory method is called whenever a new instance of a given
  * type is requested.
  * The factory method is used with a higher priority than a plain no-arg c=
onstructor when present
- *
- * @Factory currently works for @FullTextFilterDef.impl classes
- *
+ * <br />
+ * <code>&#64;Factory</code> currently works for &#64;FullTextFilterDef.im=
pl classes
+ * @see org.hibernate.search.annotations.Factory
  * @author Emmanuel Bernard
  */
 @Retention( RetentionPolicy.RUNTIME )

Modified: search/trunk/src/java/org/hibernate/search/annotations/Key.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/annotations/Key.java	2008-05=
-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/annotations/Key.java	2008-05=
-30 15:49:57 UTC (rev 14716)
@@ -14,8 +14,8 @@
  * The key object must implement equals / hashcode so that 2 keys are equa=
ls iif
  * the given target object types are the same, the set of parameters are t=
he same.
  *
- * @Factory currently works for @FullTextFilterDef.impl classes
- *
+ * &#64;Factory currently works for &#64;FullTextFilterDef.impl classes
+ * @see org.hibernate.search.annotations.Factory
  * @author Emmanuel Bernard
  */
 @Retention( RetentionPolicy.RUNTIME )

Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/=
IndexWriterSetting.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/configuration/IndexW=
riterSetting.java	2008-05-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/IndexW=
riterSetting.java	2008-05-30 15:49:57 UTC (rev 14716)
@@ -13,7 +13,7 @@
  */
 public enum IndexWriterSetting implements Serializable {
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setMaxBufferedDeleteTerms(int)
+	 * @see org.apache.lucene.index.IndexWriter#setMaxBufferedDeleteTerms(int)
 	 */
 	MAX_BUFFERED_DELETE_TERMS( "max_buffered_delete_terms" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -21,7 +21,7 @@
 		}
 	} ,
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setMaxBufferedDocs(int)
+	 * @see org.apache.lucene.index.IndexWriter#setMaxBufferedDocs(int)
 	 */
 	MAX_BUFFERED_DOCS( "max_buffered_docs" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -29,7 +29,7 @@
 		}
 	} ,
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setMaxFieldLength(int)
+	 * @see org.apache.lucene.index.IndexWriter#setMaxFieldLength(int)
 	 */
 	MAX_FIELD_LENGTH( "max_field_length" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -37,7 +37,7 @@
 		}
 	} ,
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setMaxMergeDocs(int)
+	 * @see org.apache.lucene.index.IndexWriter#setMaxMergeDocs(int)
 	 */
 	MAX_MERGE_DOCS( "max_merge_docs" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -45,7 +45,7 @@
 		}
 	} ,
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setMergeFactor(int)
+	 * @see org.apache.lucene.index.IndexWriter#setMergeFactor(int)
 	 */
 	MERGE_FACTOR( "merge_factor" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -53,7 +53,7 @@
 		}
 	} ,
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setRAMBufferSizeMB(int)
+	 * @see org.apache.lucene.index.IndexWriter#setRAMBufferSizeMB(double)
 	 */
 	RAM_BUFFER_SIZE( "ram_buffer_size" ) {
 		public void applySetting(IndexWriter writer, int value) {
@@ -61,7 +61,7 @@
 		}
 	},
 	/**
-	 * @see org.apache.lucene.index.IndexWriter.setTermIndexInterval(int)
+	 * @see org.apache.lucene.index.IndexWriter#setTermIndexInterval(int)
 	 */
 	TERM_INDEX_INTERVAL( "term_index_interval" ) {
 		public void applySetting(IndexWriter writer, int value) {

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/Abstr=
actJMSHibernateSearchController.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/AbstractJMS=
HibernateSearchController.java	2008-05-30 15:49:57 UTC (rev 14716)
@@ -20,7 +20,7 @@
  * Implement the Hibernate Search controller responsible for processing the
  * work send through JMS by the slave nodes.
  *
- * Note the subclass implementation has to implements javax.jms.MessageLis=
tener
+ * Note the subclass implementation has to implement javax.jms.MessageList=
ener
  * //TODO Ask Bill why it is required
  *
  * @author Emmanuel Bernard
@@ -29,25 +29,28 @@
 	private static final Logger log =3D LoggerFactory.getLogger( AbstractJMSH=
ibernateSearchController.class );
 =

 	/**
-	 * return the current or give a new session
-	 * This session is not used per se, but is the link to access the Search =
configuration
-	 *
+	 * Return the current or give a new session
+	 * This session is not used per se, but is the link to access the Search =
configuration.
+	 * <p>
 	 * A typical EJB 3.0 usecase would be to get the session from the contain=
er (injected)
 	 * eg in JBoss EJB 3.0
+	 * <p>
 	 * <code>
-	 * @PersistenceContext private Session session;
-	 *
-	 * protected Session getSession() {
-	 *     return session
-	 * }
-	 *
-	 * eg in any container
+	 * &#64;PersistenceContext private Session session;<br>
+	 * <br>
+	 * protected Session getSession() {<br>
+	 *  &nbsp; &nbsp;return session<br>
+	 * }<br>
+	 * </code>
+	 * <p>
+	 * eg in any container<br>
 	 * <code>
-	 * @PersistenceContext private EntityManager entityManager;
-	 *
-	 * protected Session getSession() {
-	 *     return (Session) entityManager.getdelegate();
-	 * }
+	 * &#64;PersistenceContext private EntityManager entityManager;<br>
+	 * <br>
+	 * protected Session getSession() {<br>
+	 *  &nbsp; &nbsp;return (Session) entityManager.getdelegate();<br>
+	 * }<br>
+	 * </code>
 	 */
 	protected abstract Session getSession();
 =


Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-30 14:50:47 UTC (rev 14715)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelpe=
r.java	2008-05-30 15:49:57 UTC (rev 14716)
@@ -30,7 +30,7 @@
 	 * @param directoryProviderName
 	 * @param properties
 	 * @param needWritePermissions when true the directory will be tested for=
 read-write permissions. =

-	 * @return
+	 * @return The file representing the source directory
 	 */
 	public static File getSourceDirectory( String directoryProviderName, Prop=
erties properties, boolean needWritePermissions ) {
 		String root =3D properties.getProperty( ROOTINDEX_PROP_NAME );


--===============7355989081049168304==--

From hibernate-commits at lists.jboss.org Fri May 30 18:26:14 2008
Content-Type: multipart/mixed; boundary="===============6854465606511585156=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14718 -
 search/trunk/src/java/org/hibernate/search/backend.
Date: Fri, 30 May 2008 18:26:14 -0400
Message-ID: <E1K2D38-00086n-01@committer01.frg.pub.inap.atl.jboss.com>

--===============6854465606511585156==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-30 18:26:13 -0400 (Fri, 30 May 2008)
New Revision: 14718

Modified:
   search/trunk/src/java/org/hibernate/search/backend/Workspace.java
Log:
NPE when optimize try to apply similarity: guard against that

Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-30 18:39:44 UTC (rev 14717)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java	2008-=
05-30 22:26:13 UTC (rev 14718)
@@ -252,7 +252,7 @@
 		/**
 		 * Gets the currently open IndexWriter, or creates one.
 		 * If a IndexReader was open, it will be closed first.
-		 * @param entity The entity for which the IndexWriter is needed
+		 * @param entity The entity for which the IndexWriter is needed. entity =
can be null when calling for Optimize
 		 * @param modificationOperation set to true if needed to perform modific=
ations to index
 		 * @return created or existing IndexWriter
 		 */
@@ -275,7 +275,9 @@
 						documentBuilder.getAnalyzer() :
 						SIMPLE_ANALYZER; //never used
 				writer =3D new IndexWriter( directoryProvider.getDirectory(), analyzer=
, false ); //has been created at init time
-				writer.setSimilarity( documentBuilder.getSimilarity() );
+				if ( entity !=3D null ) {
+					writer.setSimilarity( documentBuilder.getSimilarity() );
+				}
 				LuceneIndexingParameters indexingParams =3D searchFactoryImplementor.g=
etIndexingParameters( directoryProvider );
 				indexingParams.applyToWriter( writer, isBatch );
 			}


--===============6854465606511585156==--

From hibernate-commits at lists.jboss.org Fri May 30 18:28:11 2008
Content-Type: multipart/mixed; boundary="===============8707213206512863094=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14719 - in search/trunk/src:
 java/org/hibernate/search/impl and 3 other directories.
Date: Fri, 30 May 2008 18:28:11 -0400
Message-ID: <E1K2D51-0008Cl-JS@committer01.frg.pub.inap.atl.jboss.com>

--===============8707213206512863094==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-30 18:28:11 -0400 (Fri, 30 May 2008)
New Revision: 14719

Modified:
   search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplement=
or.java
   search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
   search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactor=
y.java
   search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java
Log:
HSEARCH-19 no longer filter classes when DPs contains all the targeted clas=
ses

Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryIm=
plementor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-30 22:26:13 UTC (rev 14718)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplemen=
tor.java	2008-05-30 22:28:11 UTC (rev 14719)
@@ -2,6 +2,7 @@
 package org.hibernate.search.engine;
 =

 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 =

 import org.hibernate.search.SearchFactory;
@@ -44,4 +45,8 @@
 	public String getIndexingStrategy();
 =

 	public void close();
+
+	void addClassToDirectoryProvider(Class clazz, DirectoryProvider<?> direct=
oryProvider);
+
+	Set<Class> getClassesInDirectoryProvider(DirectoryProvider<?> directoryPr=
ovider);
 }

Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-30 22:26:13 UTC (rev 14718)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java	=
2008-05-30 22:28:11 UTC (rev 14719)
@@ -4,7 +4,9 @@
 import java.beans.Introspector;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +15,7 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 =

+import org.apache.lucene.analysis.Analyzer;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionMana=
ger;
@@ -43,7 +46,6 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.DirectoryProviderFactory;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
-import org.apache.lucene.analysis.Analyzer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 =

@@ -62,10 +64,11 @@
 =

 	private final Map<Class, DocumentBuilder<Object>> documentBuilders =3D ne=
w HashMap<Class, DocumentBuilder<Object>>();
 	//keep track of the index modifiers per DirectoryProvider since multiple =
entity can use the same directory provider
+	//TODO move the ReentrantLock into DirectoryProviderData.lock, add a getD=
PLock(DP) and add a Set<DP> getDirectoryProviders() method.
 	private final Map<DirectoryProvider, ReentrantLock> lockableDirectoryProv=
iders =3D
 			new HashMap<DirectoryProvider, ReentrantLock>();
-	private final Map<DirectoryProvider, OptimizerStrategy> dirProviderOptimi=
zerStrategies =3D
-			new HashMap<DirectoryProvider, OptimizerStrategy>();
+	private final Map<DirectoryProvider, DirectoryProviderData> dirProviderDa=
ta =3D
+			new HashMap<DirectoryProvider, DirectoryProviderData>();
 	private Worker worker;
 	private ReaderProvider readerProvider;
 	private BackendQueueProcessorFactory backendQueueProcessorFactory;
@@ -139,6 +142,19 @@
 		}
 	}
 =

+	public void addClassToDirectoryProvider(Class clazz, DirectoryProvider<?>=
 directoryProvider) {
+		DirectoryProviderData data =3D dirProviderData.get(directoryProvider);
+		if (data =3D=3D null) {
+			data =3D new DirectoryProviderData();
+			dirProviderData.put( directoryProvider, data );
+		}
+		data.classes.add(clazz);
+	}
+
+	public Set<Class> getClassesInDirectoryProvider(DirectoryProvider<?> dire=
ctoryProvider) {
+		return Collections.unmodifiableSet( dirProviderData.get(directoryProvide=
r).classes );
+	}
+
 	private void bindFilterDefs(XClass mappedXClass) {
 		FullTextFilterDef defAnn =3D mappedXClass.getAnnotation( FullTextFilterD=
ef.class );
 		if ( defAnn !=3D null ) {
@@ -227,7 +243,12 @@
 	}
 =

 	public void addOptimizerStrategy(DirectoryProvider<?> provider, Optimizer=
Strategy optimizerStrategy) {
-		dirProviderOptimizerStrategies.put( provider, optimizerStrategy );
+		DirectoryProviderData data =3D dirProviderData.get(provider);
+		if (data =3D=3D null) {
+			data =3D new DirectoryProviderData();
+			dirProviderData.put( provider, data );
+		}
+		data.optimizerStrategy =3D optimizerStrategy;
 	}
 =

 	public void addIndexingParameters(DirectoryProvider<?> provider, LuceneIn=
dexingParameters indexingParams) {
@@ -235,7 +256,7 @@
 	}
 =

 	public OptimizerStrategy getOptimizerStrategy(DirectoryProvider<?> provid=
er) {
-		return dirProviderOptimizerStrategies.get( provider );
+		return dirProviderData.get( provider ).optimizerStrategy;
 	}
 =

 	public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?=
> provider ) {
@@ -301,7 +322,7 @@
 				XClass mappedXClass =3D reflectionManager.toXClass(mappedClass);
 				if ( mappedXClass !=3D null) {
 					if ( mappedXClass.isAnnotationPresent( Indexed.class ) ) {
-						DirectoryProviderFactory.DirectoryProviders providers =3D factory.cr=
eateDirectoryProviders( mappedXClass, cfg, this );
+						DirectoryProviderFactory.DirectoryProviders providers =3D factory.cr=
eateDirectoryProviders( mappedXClass, cfg, this, reflectionManager );
 =

 						final DocumentBuilder<Object> documentBuilder =3D new DocumentBuilde=
r<Object>(
 								mappedXClass, context, providers.getProviders(), providers.getSele=
ctionStrategy(),
@@ -349,4 +370,9 @@
 	public FilterDef getFilterDefinition(String name) {
 		return filterDefinitions.get( name );
 	}
+
+	private static class DirectoryProviderData {
+		public OptimizerStrategy optimizerStrategy;
+		public Set<Class> classes =3D new HashSet<Class>(2);
+	}
 }

Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImp=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-30 22:26:13 UTC (rev 14718)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java=
	2008-05-30 22:28:11 UTC (rev 14719)
@@ -69,6 +69,8 @@
 	private org.apache.lucene.search.Query luceneQuery;
 	private Class[] classes;
 	private Set<Class> classesAndSubclasses;
+	//optimization: if we can avoid the filter clause (we can most of the tim=
e) do it as it has a significant perf impact
+	private boolean needClassFilterClause;
 	private Integer firstResult;
 	private Integer maxResults;
 	private Integer resultSize;
@@ -384,12 +386,12 @@
 	}
 =

 	private org.apache.lucene.search.Query filterQueryByClasses(org.apache.lu=
cene.search.Query luceneQuery) {
-		//A query filter is more practical than a manual class filtering post qu=
ery (esp on scrollable resultsets)
-		//it also probably minimise the memory footprint
-		if ( classesAndSubclasses =3D=3D null ) {
+		if ( ! needClassFilterClause ) {
 			return luceneQuery;
 		}
 		else {
+			//A query filter is more practical than a manual class filtering post q=
uery (esp on scrollable resultsets)
+			//it also probably minimise the memory footprint	=

 			BooleanQuery classFilter =3D new BooleanQuery();
 			//annihilate the scoring impact of DocumentBuilder.CLASS_FIELDNAME
 			classFilter.setBoost( 0 );
@@ -429,13 +431,13 @@
 		List<DirectoryProvider> directories =3D new ArrayList<DirectoryProvider>=
();
 =

 		Similarity searcherSimilarity =3D null;
-
+		//TODO check if caching this work for the last n list of classes makes a=
 perf boost
 		if ( classes =3D=3D null || classes.length =3D=3D 0 ) {
 			//no class means all classes
 			for (DocumentBuilder builder : builders.values()) {
 				searcherSimilarity =3D checkSimilarity( searcherSimilarity, builder );
 				final DirectoryProvider[] directoryProviders =3D builder.getDirectoryP=
roviderSelectionStrategy().getDirectoryProvidersForAllShards();
-				populateDirectories( directories, directoryProviders );
+				populateDirectories( directories, directoryProviders, searchFactoryImp=
lementor );
 			}
 			classesAndSubclasses =3D null;
 		}
@@ -455,11 +457,30 @@
 =

 				final DirectoryProvider[] directoryProviders =3D builder.getDirectoryP=
roviderSelectionStrategy().getDirectoryProvidersForAllShards();
 				searcherSimilarity =3D checkSimilarity( searcherSimilarity, builder );
-				populateDirectories( directories, directoryProviders );
+				populateDirectories( directories, directoryProviders, searchFactoryImp=
lementor );
 			}
 			classesAndSubclasses =3D involvedClasses;
 		}
 =

+		//compute optimization needClassFilterClause
+		//if at least one DP contains one class that is not part of the targeted=
 classesAndSubclasses we can't optimize
+		if ( classesAndSubclasses !=3D null) {
+			for (DirectoryProvider dp : directories) {
+				final Set<Class> classesInDirectoryProvider =3D searchFactoryImplement=
or.getClassesInDirectoryProvider( dp );
+				// if a DP contains only one class, we know for sure it's part of clas=
sesAndSubclasses
+				if ( classesInDirectoryProvider.size() > 1 ) {
+					//risk of needClassFilterClause
+					for (Class clazz : classesInDirectoryProvider) {
+						if ( ! classesAndSubclasses.contains( clazz ) ) {
+							this.needClassFilterClause =3D true;
+							break;
+						}
+					}
+				}
+				if ( this.needClassFilterClause ) break;
+			}
+		}
+
 		//set up the searcher
 		final DirectoryProvider[] directoryProviders =3D directories.toArray( ne=
w DirectoryProvider[directories.size()] );
 		IndexSearcher is =3D new IndexSearcher( searchFactoryImplementor.getRead=
erProvider().openReader( directoryProviders ) );
@@ -467,7 +488,8 @@
 		return is;
 	}
 =

-	private void populateDirectories(List<DirectoryProvider> directories, Dir=
ectoryProvider[] directoryProviders) {
+	private void populateDirectories(List<DirectoryProvider> directories, Dir=
ectoryProvider[] directoryProviders,
+									 SearchFactoryImplementor searchFactoryImplementor) {
 		for (DirectoryProvider provider : directoryProviders) {
 			if ( !directories.contains( provider ) ) {
 				directories.add( provider );

Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvide=
rFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-30 22:26:13 UTC (rev 14718)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFacto=
ry.java	2008-05-30 22:28:11 UTC (rev 14719)
@@ -51,7 +51,9 @@
 	private static final String SHARDING_STRATEGY =3D "sharding_strategy";
 	private static final String NBR_OF_SHARDS =3D SHARDING_STRATEGY + ".nbr_o=
f_shards";
 =

-	public DirectoryProviders createDirectoryProviders(XClass entity, Configu=
ration cfg, SearchFactoryImplementor searchFactoryImplementor) {
+	public DirectoryProviders createDirectoryProviders(XClass entity, Configu=
ration cfg,
+													   SearchFactoryImplementor searchFactoryImplementor,
+													   ReflectionManager reflectionManager) {
 		//get properties
 		String directoryProviderName =3D getDirectoryProviderName( entity, cfg );
 		Properties[] indexProps =3D getDirectoryProperties( cfg, directoryProvid=
erName );
@@ -63,7 +65,8 @@
 			String providerName =3D nbrOfProviders > 1 ?
 					directoryProviderName + "." + index :
 					directoryProviderName;
-			providers[index] =3D createDirectoryProvider( providerName, indexProps[=
index], searchFactoryImplementor );
+			providers[index] =3D createDirectoryProvider( providerName, indexProps[=
index],
+					reflectionManager.toClass( entity ), searchFactoryImplementor );
 		}
 =

 		//define sharding strategy
@@ -110,7 +113,8 @@
 		}
 	}
 =

-	private DirectoryProvider<?> createDirectoryProvider(String directoryProv=
iderName, Properties indexProps, SearchFactoryImplementor searchFactoryImpl=
ementor) {
+	private DirectoryProvider<?> createDirectoryProvider(String directoryProv=
iderName, Properties indexProps,
+														 Class entity, SearchFactoryImplementor searchFactoryImpleme=
ntor) {
 		String className =3D indexProps.getProperty( "directory_provider" );
 		if ( StringHelper.isEmpty( className ) ) {
 			className =3D DEFAULT_DIRECTORY_PROVIDER;
@@ -135,12 +139,15 @@
 		int index =3D providers.indexOf( provider );
 		if ( index !=3D -1 ) {
 			//share the same Directory provider for the same underlying store
-			return providers.get( index );
+			final DirectoryProvider<?> directoryProvider =3D providers.get( index );
+			searchFactoryImplementor.addClassToDirectoryProvider(entity, directoryP=
rovider);
+			return directoryProvider;
 		}
 		else {
 			configureOptimizerStrategy( searchFactoryImplementor, indexProps, provi=
der );
 			configureIndexingParameters( searchFactoryImplementor, indexProps, prov=
ider );
 			providers.add( provider );
+			searchFactoryImplementor.addClassToDirectoryProvider(entity, provider);
 			if ( !searchFactoryImplementor.getLockableDirectoryProviders().contains=
Key( provider ) ) {
 				searchFactoryImplementor.getLockableDirectoryProviders().put( provider=
, new ReentrantLock() );
 			}

Modified: search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java	2=
008-05-30 22:26:13 UTC (rev 14718)
+++ search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java	2=
008-05-30 22:28:11 UTC (rev 14719)
@@ -2,7 +2,11 @@
 package org.hibernate.search.test;
 =

 import org.hibernate.Session;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
 =

 /**
  * @author Emmanuel Bernard
@@ -28,6 +32,11 @@
 =

 		s =3D getSessions().openSession();
 		s.getTransaction().begin();
+		TermQuery q =3D new TermQuery(new Term("alt_title", "hibernate"));
+		assertEquals( "does not properly filter", 0,
+				Search.createFullTextSession( s ).createFullTextQuery( q, Document.cla=
ss ).list().size() );
+		assertEquals( "does not properly filter", 1,
+				Search.createFullTextSession( s ).createFullTextQuery( q, Document.cla=
ss, AlternateDocument.class ).list().size() );
 		s.delete( s.get( AlternateDocument.class, document.getId() ) );
 		s.getTransaction().commit();
 		s.close();


--===============8707213206512863094==--

From hibernate-commits at lists.jboss.org Fri May 30 18:48:21 2008
Content-Type: multipart/mixed; boundary="===============1210230550932420411=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14720 - in
 search/trunk/src/test/org/hibernate/search/test: perf and 1 other directory.
Date: Fri, 30 May 2008 18:48:21 -0400
Message-ID: <E1K2DOX-0004Ll-4H@committer01.frg.pub.inap.atl.jboss.com>

--===============1210230550932420411==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-30 18:48:20 -0400 (Fri, 30 May 2008)
New Revision: 14720

Added:
   search/trunk/src/test/org/hibernate/search/test/perf/
   search/trunk/src/test/org/hibernate/search/test/perf/Boat.java
   search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.ja=
va
   search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.java
Log:
Add dumb perf test

Added: search/trunk/src/test/org/hibernate/search/test/perf/Boat.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/perf/Boat.java	        =
                (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/perf/Boat.java	2008-05-=
30 22:48:20 UTC (rev 14720)
@@ -0,0 +1,33 @@
+package org.hibernate.search.test.perf;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Store;
+
+/**
+ * @author Emmanuel Bernard
+ */
+(a)Entity
+(a)Indexed
+public class Boat {
+	@Id
+	@GeneratedValue
+	@DocumentId
+	public Integer id;
+	@Field(store=3D Store.YES)
+	public String name;
+	@Field
+	public String description;
+
+	public Boat() {}
+
+	public Boat(String name, String description) {
+		this.name =3D name;
+		this.description =3D description;
+	}
+}

Added: search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRu=
n.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.j=
ava	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.j=
ava	2008-05-30 22:48:20 UTC (rev 14720)
@@ -0,0 +1,81 @@
+package org.hibernate.search.test.perf;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.textui.TestRunner;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.store.Directory;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.search.Search;
+import org.hibernate.search.store.FSDirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class IndexTestDontRun extends SearchTestCase {
+	private static boolean isLucene;
+
+	public static void main(String[] args) {
+		//isLucene =3D Boolean.parseBoolean( args[0] );
+		TestRunner.run( IndexTestDontRun.class );
+
+	}
+
+	public void NonestInit() throws Exception {
+		long time =3D System.currentTimeMillis();
+		Session s =3D openSession();
+		Transaction tx =3D s.beginTransaction();
+		for (int i =3D 0; i < 50000; i++) {
+			s.save( new Boat( "Maria el Seb", "a long" + i + " description of the l=
and" + i ) );
+		}
+		tx.commit();
+		s.close();
+		System.out.println( " init time =3D " + ( System.currentTimeMillis() - t=
ime ) );
+	}
+
+	public void testPerf() throws Exception {
+		boolean useLucene =3D true;
+
+		List<SearcherThread> threads =3D new ArrayList<SearcherThread>( 100 );
+		IndexSearcher indexsearcher =3D getNewSearcher();
+		SearcherThread searcherThrea =3D new SearcherThread( 0, "name:maria OR d=
escription:long" + 0, getSessions(), indexsearcher, useLucene );
+		searcherThrea.run();
+		for (int i =3D 1; i <=3D 100; i++) {
+			// Create a thread and invoke it
+			//if ( i % 100 =3D=3D 0) indexsearcher =3D getNewSearcher();
+			SearcherThread searcherThread =3D new SearcherThread( i, "name:maria OR=
 description:long" + i, getSessions(), indexsearcher, useLucene );
+			searcherThread.setDaemon( false );
+			threads.add( searcherThread );
+			searcherThread.start();
+		}
+		Thread.sleep( 5000 );
+		long totalTime =3D 0;
+		for (SearcherThread t : threads) totalTime +=3D t.time;
+		System.out.println( "Totaltime=3D" + totalTime );
+	}
+
+	private IndexSearcher getNewSearcher() throws IOException {
+		final org.hibernate.classic.Session session =3D getSessions().openSessio=
n();
+		Directory d =3D Search.createFullTextSession( session ).getSearchFactory=
().getDirectoryProviders( Boat.class )[0].getDirectory();
+		IndexSearcher indexsearcher =3D new IndexSearcher( d );
+		return indexsearcher;
+	}
+
+	protected Class[] getMappings() {
+		return new Class[] {
+				Boat.class
+		};
+	}
+
+	protected void configure(Configuration cfg) {
+		super.configure( cfg );
+		cfg.setProperty( "hibernate.search.default.directory_provider", FSDirect=
oryProvider.class.getName() );
+		//cfg.setProperty( "hibernate.search.reader.strategy", DumbSharedReaderP=
rovider.class.getName() );
+
+	}
+}

Added: search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.jav=
a	                        (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/perf/SearcherThread.jav=
a	2008-05-30 22:48:20 UTC (rev 14720)
@@ -0,0 +1,128 @@
+package org.hibernate.search.test.perf;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.store.Directory;
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
+import org.hibernate.search.Search;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.FullTextQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class SearcherThread extends Thread {
+	private static Logger log =3D LoggerFactory.getLogger( SearcherThread.cla=
ss );
+	private int threadId;
+	private String queryString;
+	private SessionFactory sf;
+	private IndexSearcher indexsearcher;
+	private boolean isLucene;
+	public long time;
+
+	/**
+	 * Initialize with thread-id, querystring, indexsearcher
+	 */
+	public SearcherThread(int threadId, String queryString, SessionFactory sf=
, IndexSearcher indexSearcher, boolean isLucene) {
+		this.isLucene =3D isLucene;
+		this.threadId =3D threadId;
+		this.queryString =3D queryString;
+		this.sf =3D sf;
+		this.indexsearcher =3D indexSearcher;
+	}
+
+	public void run() {
+		if ( isLucene ) {
+			runLucene();
+		}
+		else {
+			runHSearch();
+		}
+	}
+
+	/**
+	 * @see java.lang.Runnable#run()
+	 */
+	public void runLucene() {
+
+		try {
+			QueryParser qp =3D new QueryParser( "t",
+					new StandardAnalyzer() );
+			qp.setLowercaseExpandedTerms( true );
+			// Parse the query
+			Query q =3D qp.parse( queryString );
+			if ( q instanceof BooleanQuery ) {
+				BooleanQuery
+						.setMaxClauseCount( Integer.MAX_VALUE );
+			}
+			long start =3D System.currentTimeMillis();
+			// Search
+			Hits hits =3D indexsearcher.search( q );
+			List<String> names =3D new ArrayList<String>(100);
+			for (int i =3D 1 ; i <=3D 100 ; i++) {
+				names.add( hits.doc( i ).get( "name" ) );
+			}
+			long totalTime =3D System.currentTimeMillis() - start;
+			log.error( "Lucene [ Thread-id : " + threadId + " ] Total time taken fo=
r search is : " + totalTime + "ms with total no. of matching records : " + =
hits.length() );
+			time =3D totalTime;
+		}
+		catch (ParseException e) {
+			// TODO Auto-generated catch block
+			System.out.println( "[ Thread-id : " + threadId + " ] Parse Exception f=
or queryString : " + queryString );
+			e.printStackTrace();
+		}
+		catch (IOException e) {
+			System.out.println( "[ Thread-id : " + threadId + " ] IO Exception for =
queryString : " + queryString );
+		}
+		catch (Exception e) {
+			e.printStackTrace( );
+		}
+	}
+
+	public void runHSearch() {
+
+		try {
+			QueryParser qp =3D new QueryParser( "t",
+					new StandardAnalyzer() );
+			qp.setLowercaseExpandedTerms( true );
+
+			// Parse the query
+			Query q =3D qp.parse( queryString );
+			=

+
+			// Search
+			FullTextSession ftSession =3D Search.createFullTextSession( sf.openSess=
ion(  ) );
+
+			final FullTextQuery textQuery =3D ftSession.createFullTextQuery( q, Boa=
t.class )
+					.setMaxResults( 100 ).setProjection( "name" );
+			long start =3D System.currentTimeMillis();
+			List results =3D textQuery.list();
+			long totalTime =3D System.currentTimeMillis() - start;
+			ftSession.close();
+
+			log.error( "HSearch [ Thread-id : " + threadId + " ] Total time taken f=
or search is : " + totalTime + "ms with total no. of matching records : " +=
 textQuery.getResultSize() );
+			time =3D totalTime;
+		}
+		catch (ParseException e) {
+			// TODO Auto-generated catch block
+			log.error( "[ Thread-id : " + threadId + " ] Parse Exception for queryS=
tring : " + queryString );
+			e.printStackTrace();
+		}
+		catch (Throwable e) {
+			log.error( "[ Thread-id : " + threadId + " ] Exception for queryString =
: " + queryString );
+			e.printStackTrace(  );
+		}
+	}
+}


--===============1210230550932420411==--

From hibernate-commits at lists.jboss.org Fri May 30 18:48:49 2008
Content-Type: multipart/mixed; boundary="===============6377504197018571535=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14721 -
 search/trunk/src/test/org/hibernate/search/test/perf.
Date: Fri, 30 May 2008 18:48:49 -0400
Message-ID: <E1K2DOz-0004Lz-Mj@committer01.frg.pub.inap.atl.jboss.com>

--===============6377504197018571535==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-30 18:48:49 -0400 (Fri, 30 May 2008)
New Revision: 14721

Modified:
   search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.ja=
va
Log:
Add dumb perf test

Modified: search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDon=
tRun.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.j=
ava	2008-05-30 22:48:20 UTC (rev 14720)
+++ search/trunk/src/test/org/hibernate/search/test/perf/IndexTestDontRun.j=
ava	2008-05-30 22:48:49 UTC (rev 14721)
@@ -39,7 +39,7 @@
 	}
 =

 	public void testPerf() throws Exception {
-		boolean useLucene =3D true;
+		boolean useLucene =3D false;
 =

 		List<SearcherThread> threads =3D new ArrayList<SearcherThread>( 100 );
 		IndexSearcher indexsearcher =3D getNewSearcher();


--===============6377504197018571535==--

From hibernate-commits at lists.jboss.org Sat May 31 09:34:48 2008
Content-Type: multipart/mixed; boundary="===============2140907870169950791=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r14722 -
 search/trunk/src/java/org/hibernate/search/engine.
Date: Sat, 31 May 2008 09:34:48 -0400
Message-ID: <E1K2REO-0006hB-QH@committer01.frg.pub.inap.atl.jboss.com>

--===============2140907870169950791==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: epbernard
Date: 2008-05-31 09:34:48 -0400 (Sat, 31 May 2008)
New Revision: 14722

Modified:
   search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java
Log:
HSEARCH-204 the shortcut test avoiding session calls was broken

Modified: search/trunk/src/java/org/hibernate/search/engine/ProjectionLoade=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java=
	2008-05-30 22:48:49 UTC (rev 14721)
+++ search/trunk/src/java/org/hibernate/search/engine/ProjectionLoader.java=
	2008-05-31 13:34:48 UTC (rev 14722)
@@ -46,7 +46,7 @@
 =

 	private void initThisProjectionFlag(EntityInfo entityInfo) {
 		if ( projectThis =3D=3D null ) {
-			projectThis =3D entityInfo.indexesOfThis !=3D null;
+			projectThis =3D entityInfo.indexesOfThis.size() !=3D 0;
 			if ( projectThis ) {
 				//TODO use QueryLoader when possible
 				objectLoader =3D new ObjectLoader();


--===============2140907870169950791==--