File: debian-changes-3.5.4.Final-4

package info (click to toggle)
libhibernate3-java 3.5.4.Final-5
links: PTS, VCS
area: main
in suites: squeeze
size: 56,936 kB
ctags: 61,154
sloc: java: 323,763; xml: 160,906; perl: 65; sh: 25; makefile: 8
file content (7495 lines) | stat: -rw-r--r-- 303,985 bytes
Description: Upstream changes introduced in version 3.5.4.Final-4
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 libhibernate3-java (3.5.4.Final-4) unstable; urgency=medium
 .
   [ Miguel Landaeta ]
   * debian/rules: Fix clean target. (Closes: #594145).
   * Bump Standards-Version to 3.9.1. No changes were required.
 .
   [ Torsten Werner ]
   * Add javadocs. (Closes: #594441)
   * Set urgency to medium because we are fixing RC and documentation bugs.
   * Update Vcs headers in debian/control to match reality.
 .
 The person named in the Author field signed this changelog entry.
Author: Torsten Werner <twerner@debian.org>
Bug-Debian: http://bugs.debian.org/594145
Bug-Debian: http://bugs.debian.org/594441

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- libhibernate3-java-3.5.4.Final.orig/changelog.txt
+++ libhibernate3-java-3.5.4.Final/changelog.txt
@@ -5,81 +5,6 @@ match the actual issue resolution (i.e.
 refer to the particular case on JIRA using the issue tracking number to learn
 more about each case.
 
-Changes in version 3.5.4 (2010.07.21)
--------------------------------------------
-http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11100
-
-** Bug
-
-    * [HHH-2269] - Many-to-one cascade fails with TransientObjectException if the inverse collection is marked CascadeType.DELETE_ORPHAN
-    * [HHH-3001] - The NoopOptimizer is not thread safe
-    * [HHH-3694] - ResultTransformer not used when scroll() is used on a named SQLQuery
-    * [HHH-4156] - c3p0 is not used when only specific hibernate.c3p0.* properties
-    * [HHH-4240] - SecondaryTables not recognized when using JOINED inheritance
-    * [HHH-4250] - @ManyToOne - @OneToMany doesn't work with @Inheritance(strategy= InheritanceType.JOINED)
-    * [HHH-4568] - Sybase - Test "BatchTest" fails due to "unexpected row count from update"
-    * [HHH-4647] - Problems with @JoinColumn referencedColumnName and quoted column and table names
-    * [HHH-4716] - NotAuditedException using the entity name concept of hibernate.
-    * [HHH-5109] - @OneToOne - too many joins
-    * [HHH-5272] - Typo in tutorial at web site
-    * [HHH-5315] - AuditJoinTable rows are no longer flushed to the database
-    * [HHH-5318] - Wrong logic for RequiresDialectFeature in org.hibernate.test.annotations.HibernateTestCase
-    * [HHH-5319] - Clean up data created in org.hibernate.test.annotations.onetomany.OneToManyTest#testUnidirectionalExplicit
-    * [HHH-5320] - IntermediateMappedSuperclassTest should set the scale of the BigDecimal
-    * [HHH-5322] - Regression in PersistenceUtilHelper
-    * [HHH-5323] - correct jdbc driver version for testing
-    * [HHH-5324] - Tests fail on mysql
-    * [HHH-5329] - NoClassDefFoundError when using Hibernate 3.5 with J2SE 1.4 because of a wrong catch block
-    * [HHH-5332] - JndiInfinispanRegionFactory cannot be instantiated
-    * [HHH-5334] - PersistenceUtilHelpe.findMember(Class, String) private method doesn't work with members of a superclass
-    * [HHH-5340] - Typo in tutorial at web site
-    * [HHH-5370] - Building IN condition with CriteriaBuilder providing collection of values not working.
-    * [HHH-5402] - Revert to hsqldb 1.8.0.2 as the test version for 3.5.4
-
-** New Feature
-
-    * [HHH-3659] - statistics: Execution time of a query
-    * [HHH-5260] - Allow query region name specific eviction settings
-
-** Patch
-
-    * [HHH-5213] - Add native SQL Boolean type to Ingres10Dialect
-    * [HHH-5336] - a few typo fixes
-    * [HHH-5381] - HSQLDB new dialect (Fred Toussi)
-
-
-Changes in version 3.5.3 (2010.06.16)
--------------------------------------------
-http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11051
-
-** Bug
-    * [HHH-4036] - EntityMetamodel entityNameByInheritenceClassNameMap field used inconsistently
-    * [HHH-4968] - Cannot deactivate default BeanValidationListener independently of DDL constraints generation (Vladimir Klyushnikov)
-    * [HHH-5094] - PersistenceUtilHelper cannot access non-public fields/methods (it should be able to)
-    * [HHH-5098] - AssertionFailure thrown when collection contains a parameterized type
-    * [HHH-5191] - CollectionMetadataGenerator fails to obtain mappedBy attribute when is defined on superclasses
-    * [HHH-5195] - FilterImpl.validate() throws NullPointerExeption on deserialization
-    * [HHH-5204] - Introduce @RequiresDialectFeature annotation
-    * [HHH-5220] - Unit tests related to HHH-5063 and HHH-5135 fail on some dialects
-    * [HHH-5230] - Regresion! @SequenceGenerator with allocationSize=1 fails Other allocationSizes appear to be decremented by 1
-    * [HHH-5231] - Unit test failures lock up when they run on DB2 and PostgreSQL
-    * [HHH-5253] - TableHiLoGenerator does not increment hi-value any more when lo-range es exhausted
-    * [HHH-5258] - Persistence.isLoaded(Object, String) fails if the annotated property does not have a public getter or field
-    * [HHH-5286] - Jar Scanner instances cannot be passed to EntityManagerFactory creation method
-    * [HHH-5288] - Envers auditReader.find() returns wrong data for embedded components using fields with default values
-    * [HHH-5298] - @AuditMappedBy doesn't work on an inherited relation
-
-** Improvement
-    * [HHH-5251] - NativeSQLQueryReturn impls pre-cache a final hashcode based on non-final fields
-    * [HHH-5252] - AttributeFactory needs more info in AssertionFailure
-
-** Patch
-    * [HHH-3220] - Patch to prevent "org.hibernate.AssertionFailure: possible non-threadsafe access to the session" error caused by stateless sessions
-
-** Task
-    * [HHH-5281] - TypeSafeActivator should also generate constraints for @Length
-    * [HHH-5312] - update the db account used in branch 35 test
-
 
 Changes in version 3.5.2 (2010.05.13)
 -------------------------------------------
--- libhibernate3-java-3.5.4.Final.orig/pom.xml
+++ libhibernate3-java-3.5.4.Final/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/tutorials/pom.xml
+++ libhibernate3-java-3.5.4.Final/tutorials/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/tutorials/eg/pom.xml
+++ libhibernate3-java-3.5.4.Final/tutorials/eg/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/tutorials/web/pom.xml
+++ libhibernate3-java-3.5.4.Final/tutorials/web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/documentation/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
@@ -140,7 +140,7 @@
             <tip>
                 <para>
                     It is not a requirement to use Maven.  If you wish to use something else to
-                    build this tutorial (such as Ant), the layout will remain the same.  The only
+                    build this tutoial (such as Ant), the layout will remain the same.  The only
                     change is that you will need to manually account for all the needed
                     dependencies.  If you use something like <ulink url="http://ant.apache.org/ivy/">Ivy</ulink>
                     providing transitive dependency management you would still use the dependencies
@@ -674,7 +674,7 @@ public class HibernateUtil {
             <title>Loading and storing objects</title>
 
             <para>
-                We are now ready to start doing some real work with Hibernate.
+                We are now ready to start doing some real worjk with Hibernate.
                 Let's start by writing an <literal>EventManager</literal> class
                 with a <literal>main()</literal> method:
             </para>
@@ -723,7 +723,7 @@ public class EventManager {
 
             <para>
                 A <interface>org.hibernate.Session</interface> is designed to
-                represent a single unit of work (a single atomic piece of work
+                represent a single unit of work (a single atmoic piece of work
                 to be performed).  For now we will keep things simple and assume
                 a one-to-one granularity between a Hibernate
                 <interface>org.hibernate.Session</interface> and a database
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
@@ -1113,7 +1113,7 @@
         node="element-name|."
 
         <key-property name="propertyName" type="typename" column="column_name"/>
-        <key-many-to-one name="propertyName" class="ClassName" column="column_name"/>
+        <key-many-to-one name="propertyName class="ClassName" column="column_name"/>
         ......
 </composite-id>]]></programlisting>
 
@@ -1856,7 +1856,7 @@
                 associated object. The meaningful values are divided into three categories. First, basic
                 operations, which include: <literal>persist, merge, delete, save-update, evict, replicate, lock and
                 refresh</literal>; second, special values: <literal>delete-orphan</literal>;
-                and third, <literal>all</literal> comma-separated combinations of operation
+                and third,<literal>all</literal> comma-separated combinations of operation
                 names: <literal>cascade="persist,merge,evict"</literal> or
                 <literal>cascade="all,delete-orphan"</literal>. See <xref linkend="objectstate-transitive"/>
                 for a full explanation. Note that single valued, many-to-one and
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/src/main/docbook/en-US/content/configuration.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/src/main/docbook/en-US/content/configuration.xml
@@ -604,7 +604,7 @@ hibernate.dialect = org.hibernate.dialec
                         </entry>
                         <entry>
                             Set this property to <literal>true</literal> if your JDBC driver returns
-                            correct row counts from <literal>executeBatch()</literal>. It is usually
+                            correct row counts from <literal>executeBatch()</literal>. Iit is usually
                             safe to turn this option on. Hibernate will then use batched DML for
                             automatically versioned data. Defaults to <literal>false</literal>.
                             <para>
@@ -1674,7 +1674,7 @@ hibernate.dialect = org.hibernate.dialec
                 <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.getCurrentSession()</literal>. The <literal>Session</literal>s
-	            retrieved via <literal>getCurrentSession()</literal> in the <literal>"jta"</literal> context
+	            retrieved via <literal>getCurrentSession()</literal> in the<literal>"jta"</literal> context
 	            are set to automatically flush before the transaction completes, close
 	            after the transaction completes, and aggressively release JDBC connections
 	            after each statement.  This allows the <literal>Session</literal>s to
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/pt-BR/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/pt-BR/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/ja-JP/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/ja-JP/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/fr-FR/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/fr-FR/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/ko-KR/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/ko-KR/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/zh-CN/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/zh-CN/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/manual/old/es-ES/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/manual/old/es-ES/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-manual-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
     </parent>
     
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
     <packaging>jdocbook</packaging>
     
     <name>Hibernate Manual (${translation})</name>
--- libhibernate3-java-3.5.4.Final.orig/documentation/envers/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/envers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/documentation/jbosscache2/pom.xml
+++ libhibernate3-java-3.5.4.Final/documentation/jbosscache2/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/cache-jbosscache/pom.xml
+++ libhibernate3-java-3.5.4.Final/cache-jbosscache/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/testing/pom.xml
+++ libhibernate3-java-3.5.4.Final/testing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java
+++ libhibernate3-java-3.5.4.Final/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java
@@ -1,3 +1,4 @@
+// $Id: HibernateTestCase.java 19255 2010-04-21 01:57:44Z steve.ebersole@jboss.com $
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -29,6 +30,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
 
 import junit.framework.TestCase;
 import org.slf4j.Logger;
@@ -37,10 +40,8 @@ import org.slf4j.LoggerFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.jdbc.Work;
-import org.hibernate.junit.DialectChecks;
 import org.hibernate.junit.FailureExpected;
 import org.hibernate.junit.RequiresDialect;
-import org.hibernate.junit.RequiresDialectFeature;
 import org.hibernate.junit.SkipForDialect;
 import org.hibernate.junit.SkipLog;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
@@ -59,6 +60,23 @@ public abstract class HibernateTestCase
 	protected static Configuration cfg;
 	private static Class<?> lastTestClass;
 
+
+	/**
+	 * Flag indicating whether the test should be run or skipped.
+	 */
+	private boolean runTest = true;
+
+	/**
+	 * List of required dialect for the current {@code runMethod}. If the list is empty any dialect is allowed.
+	 * Otherwise the current dialect or a superclass of the current dialect must be in the list.
+	 */
+	private final Set<Class<? extends Dialect>> requiredDialectList = new HashSet<Class<? extends Dialect>>();
+
+	/**
+	 * List of dialects for which the current {@code runMethod} should be skipped.
+	 */
+	private final Set<Class<? extends Dialect>> skipForDialectList = new HashSet<Class<? extends Dialect>>();
+
 	public HibernateTestCase() {
 		super();
 	}
@@ -154,7 +172,7 @@ public abstract class HibernateTestCase
 		}
 	}
 
-	protected final Skip determineSkipByDialect(Dialect dialect, Method runMethod) throws Exception {
+	protected final Skip determineSkipByDialect(Dialect dialect, Method runMethod) {
 		// skips have precedence, so check them first
 		SkipForDialect skipForDialectAnn = locateAnnotation( SkipForDialect.class, runMethod );
 		if ( skipForDialectAnn != null ) {
@@ -177,28 +195,18 @@ public abstract class HibernateTestCase
 		if ( requiresDialectAnn != null ) {
 			for ( Class<? extends Dialect> dialectClass : requiresDialectAnn.value() ) {
 				if ( requiresDialectAnn.strictMatching() ) {
-					if ( !dialectClass.equals( dialect.getClass() ) ) {
+					if ( dialectClass.equals( dialect.getClass() ) ) {
 						return buildSkip( dialect, null, null );
 					}
 				}
 				else {
-					if ( !dialectClass.isInstance( dialect ) ) {
-						return buildSkip( dialect, requiresDialectAnn.comment(), requiresDialectAnn.jiraKey() );
+					if ( dialectClass.isInstance( dialect ) ) {
+						return buildSkip( dialect, null, null );
 					}
 				}
 			}
 		}
 
-		// then check against a dialect feature
-		RequiresDialectFeature requiresDialectFeatureAnn = locateAnnotation( RequiresDialectFeature.class, runMethod );
-		if ( requiresDialectFeatureAnn != null ) {
-			Class<? extends DialectChecks> checkClass = requiresDialectFeatureAnn.value();
-			DialectChecks check = checkClass.newInstance();
-			boolean skip = !check.include( dialect );
-			if ( skip ) {
-				return buildSkip( dialect, requiresDialectFeatureAnn.comment(), requiresDialectFeatureAnn.jiraKey() );
-			}
-		}
 		return null;
 	}
 
@@ -236,6 +244,30 @@ public abstract class HibernateTestCase
 		return this.getClass().getName() + "#" + this.getName();
 	}
 
+	protected boolean runForCurrentDialect() {
+		boolean runTestForCurrentDialect = true;
+
+		// check whether the current dialect is assignableFrom from any of the specified required dialects.
+		for ( Class<? extends Dialect> dialect : requiredDialectList ) {
+			if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) {
+				runTestForCurrentDialect = true;
+				break;
+			}
+			runTestForCurrentDialect = false;
+		}
+
+		// check whether the current dialect is assignableFrom from any of the specified skip for dialects.
+		for ( Class<? extends Dialect> dialect : skipForDialectList ) {
+			if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) {
+				runTestForCurrentDialect = false;
+				break;
+			}
+			runTestForCurrentDialect = true;
+		}
+
+		return runTestForCurrentDialect;
+	}
+
 	private Method findTestMethod() {
 		String fName = getName();
 		assertNotNull( fName );
@@ -257,7 +289,7 @@ public abstract class HibernateTestCase
 	protected abstract Class<?>[] getAnnotatedClasses();
 
 	protected String[] getMappings() {
-		return new String[] { };
+		return new String[]{};
 	}
 
 	protected abstract void handleUnclosedResources();
--- libhibernate3-java-3.5.4.Final.orig/testing/src/main/java/org/hibernate/junit/RequiresDialect.java
+++ libhibernate3-java-3.5.4.Final/testing/src/main/java/org/hibernate/junit/RequiresDialect.java
@@ -33,15 +33,14 @@ import org.hibernate.dialect.Dialect;
 /**
  * Annotation used to indicate that a test should be run only when run against the
  * indicated dialects.
- *
+ * 
  * @author Hardy Ferentschik
  */
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface RequiresDialect {
 	/**
 	 * The dialects against which to run the test
-	 *
 	 * @return The dialects
 	 */
 	Class<? extends Dialect>[] value();
@@ -49,22 +48,7 @@ public @interface RequiresDialect {
 	/**
 	 * Used to indicate if the dialects should be matched strictly (classes equal) or
 	 * non-strictly (instanceof).
-	 *
 	 * @return Should strict matching be used?
 	 */
 	boolean strictMatching() default false;
-
-	/**
-	 * Comment describing the reason why the dialect is required.
-	 *
-	 * @return The comment
-	 */
-	String comment() default "";
-
-	/**
-	 * The key of a JIRA issue which relates this this restriction
-	 *
-	 * @return The jira issue key
-	 */
-	String jiraKey() default "";
 }
--- libhibernate3-java-3.5.4.Final.orig/core/pom.xml
+++ libhibernate3-java-3.5.4.Final/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java
+++ libhibernate3-java-3.5.4.Final/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java
@@ -28,7 +28,6 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.hibernate.Hibernate;
-import org.hibernate.TestingDatabaseInfo;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.cfg.NamingStrategy;
@@ -78,7 +77,10 @@ public class SequenceHiLoGeneratorTest e
 		//noinspection deprecation
 		generator.configure( Hibernate.LONG, properties, dialect );
 
-		cfg = TestingDatabaseInfo.buildBaseConfiguration()
+		cfg = new Configuration()
+				.setProperty( Environment.DRIVER, "org.hsqldb.jdbcDriver" )
+				.setProperty( Environment.URL, "jdbc:hsqldb:." )
+				.setProperty( Environment.USER, "sa" )
 				.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
 		cfg.addAuxiliaryDatabaseObject(
 				new SimpleAuxiliaryDatabaseObject(
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * 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 Inc.
+ * 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
@@ -20,20 +20,21 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
+ *
  */
 package org.hibernate.connection;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.Map;
+import java.beans.Introspector;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,20 +51,17 @@ import org.hibernate.util.ReflectHelper;
  * to choose either <tt>DriverManagerConnectionProvider</tt>,
  * <tt>DatasourceConnectionProvider</tt>, <tt>C3P0ConnectionProvider</tt> or
  * <tt>DBCPConnectionProvider</tt>.
- *
- * @author Gavin King
  * @see ConnectionProvider
+ * @author Gavin King
  */
 
 public final class ConnectionProviderFactory {
 
-	private static final Logger log = LoggerFactory.getLogger( ConnectionProviderFactory.class );
+	private static final Logger log = LoggerFactory.getLogger(ConnectionProviderFactory.class);
 
 	/**
 	 * Instantiate a <tt>ConnectionProvider</tt> using <tt>System</tt> properties.
-	 *
 	 * @return The created connection provider.
-	 *
 	 * @throws HibernateException
 	 */
 	public static ConnectionProvider newConnectionProvider() throws HibernateException {
@@ -73,11 +71,8 @@ public final class ConnectionProviderFac
 	/**
 	 * Instantiate a <tt>ConnectionProvider</tt> using given properties.
 	 * Method newConnectionProvider.
-	 *
 	 * @param properties hibernate <tt>SessionFactory</tt> properties
-	 *
 	 * @return ConnectionProvider
-	 *
 	 * @throws HibernateException
 	 */
 	public static ConnectionProvider newConnectionProvider(Properties properties) throws HibernateException {
@@ -88,26 +83,27 @@ public final class ConnectionProviderFac
 	 * Create a connection provider based on the given information.
 	 *
 	 * @param properties Properties being used to build the {@link org.hibernate.SessionFactory}.
-	 * @param connectionProviderInjectionData Something to be injected in the connection provided
-	 *
+	 * @param connectionProviderInjectionData Soemthing to be injected in the conenction provided
 	 * @return The created connection provider
-	 *
 	 * @throws HibernateException
 	 */
-	public static ConnectionProvider newConnectionProvider(Properties properties, Map connectionProviderInjectionData)
-			throws HibernateException {
+	public static ConnectionProvider newConnectionProvider(Properties properties, Map connectionProviderInjectionData) throws HibernateException {
 		ConnectionProvider connections;
-		String providerClass = properties.getProperty( Environment.CONNECTION_PROVIDER );
-		if ( providerClass != null ) {
-			connections = initializeConnectionProviderFromConfig( providerClass );
-		}
-		else if ( c3p0ConfigDefined( properties ) && c3p0ProviderPresent() ) {
-			connections = initializeConnectionProviderFromConfig("org.hibernate.connection.C3P0ConnectionProvider");
+		String providerClass = properties.getProperty(Environment.CONNECTION_PROVIDER);
+		if ( providerClass!=null ) {
+			try {
+				log.info("Initializing connection provider: " + providerClass);
+				connections = (ConnectionProvider) ReflectHelper.classForName(providerClass).newInstance();
+			}
+			catch ( Exception e ) {
+				log.error( "Could not instantiate connection provider", e );
+				throw new HibernateException("Could not instantiate connection provider: " + providerClass);
+			}
 		}
-		else if ( properties.getProperty( Environment.DATASOURCE ) != null ) {
+		else if ( properties.getProperty(Environment.DATASOURCE)!=null ) {
 			connections = new DatasourceConnectionProvider();
 		}
-		else if ( properties.getProperty( Environment.URL ) != null ) {
+		else if ( properties.getProperty(Environment.URL)!=null ) {
 			connections = new DriverManagerConnectionProvider();
 		}
 		else {
@@ -120,71 +116,30 @@ public final class ConnectionProviderFac
 				BeanInfo info = Introspector.getBeanInfo( connections.getClass() );
 				PropertyDescriptor[] descritors = info.getPropertyDescriptors();
 				int size = descritors.length;
-				for ( int index = 0; index < size; index++ ) {
+				for (int index = 0 ; index < size ; index++) {
 					String propertyName = descritors[index].getName();
 					if ( connectionProviderInjectionData.containsKey( propertyName ) ) {
 						Method method = descritors[index].getWriteMethod();
-						method.invoke(
-								connections, new Object[] { connectionProviderInjectionData.get( propertyName ) }
-						);
+						method.invoke( connections, new Object[] { connectionProviderInjectionData.get( propertyName ) } );
 					}
 				}
 			}
-			catch ( IntrospectionException e ) {
-				throw new HibernateException( "Unable to inject objects into the connection provider", e );
+			catch (IntrospectionException e) {
+				throw new HibernateException("Unable to inject objects into the conenction provider", e);
 			}
-			catch ( IllegalAccessException e ) {
-				throw new HibernateException( "Unable to inject objects into the connection provider", e );
+			catch (IllegalAccessException e) {
+				throw new HibernateException("Unable to inject objects into the conenction provider", e);
 			}
-			catch ( InvocationTargetException e ) {
-				throw new HibernateException( "Unable to inject objects into the connection provider", e );
+			catch (InvocationTargetException e) {
+				throw new HibernateException("Unable to inject objects into the conenction provider", e);
 			}
 		}
-		connections.configure( properties );
-		return connections;
-	}
-
-	private static boolean c3p0ProviderPresent() {
-		try {
-			ReflectHelper.classForName( "org.hibernate.connection.C3P0ConnectionProvider" );
-		}
-		catch ( ClassNotFoundException e ) {
-			log.warn( "c3p0 properties is specificed, but could not find org.hibernate.connection.C3P0ConnectionProvider from the classpath, " +
-					"these properties are going to be ignored." );
-			return false;
-		}
-		return true;
-	}
-
-	private static boolean c3p0ConfigDefined(Properties properties) {
-		Iterator iter = properties.keySet().iterator();
-		while ( iter.hasNext() ) {
-			String property = (String) iter.next();
-			if ( property.startsWith( "hibernate.c3p0" ) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static ConnectionProvider initializeConnectionProviderFromConfig(String providerClass) {
-		ConnectionProvider connections;
-		try {
-			log.info( "Initializing connection provider: " + providerClass );
-			connections = (ConnectionProvider) ReflectHelper.classForName( providerClass ).newInstance();
-		}
-		catch ( Exception e ) {
-			log.error( "Could not instantiate connection provider", e );
-			throw new HibernateException( "Could not instantiate connection provider: " + providerClass );
-		}
+		connections.configure(properties);
 		return connections;
 	}
 
 	// cannot be instantiated
-
-	private ConnectionProviderFactory() {
-		throw new UnsupportedOperationException();
-	}
+	private ConnectionProviderFactory() { throw new UnsupportedOperationException(); }
 
 	/**
 	 * Transform JDBC connection properties.
@@ -198,31 +153,28 @@ public final class ConnectionProviderFac
 		Properties result = new Properties();
 		while ( iter.hasNext() ) {
 			String prop = (String) iter.next();
-			if ( prop.startsWith( Environment.CONNECTION_PREFIX ) && !SPECIAL_PROPERTIES.contains( prop ) ) {
+			if ( prop.startsWith(Environment.CONNECTION_PREFIX) && !SPECIAL_PROPERTIES.contains(prop) ) {
 				result.setProperty(
-						prop.substring( Environment.CONNECTION_PREFIX.length() + 1 ),
-						properties.getProperty( prop )
+					prop.substring( Environment.CONNECTION_PREFIX.length()+1 ),
+					properties.getProperty(prop)
 				);
 			}
 		}
-		String userName = properties.getProperty( Environment.USER );
-		if ( userName != null ) {
-			result.setProperty( "user", userName );
-		}
+		String userName = properties.getProperty(Environment.USER);
+		if (userName!=null) result.setProperty( "user", userName );
 		return result;
 	}
 
 	private static final Set SPECIAL_PROPERTIES;
-
 	static {
 		SPECIAL_PROPERTIES = new HashSet();
-		SPECIAL_PROPERTIES.add( Environment.DATASOURCE );
-		SPECIAL_PROPERTIES.add( Environment.URL );
-		SPECIAL_PROPERTIES.add( Environment.CONNECTION_PROVIDER );
-		SPECIAL_PROPERTIES.add( Environment.POOL_SIZE );
-		SPECIAL_PROPERTIES.add( Environment.ISOLATION );
-		SPECIAL_PROPERTIES.add( Environment.DRIVER );
-		SPECIAL_PROPERTIES.add( Environment.USER );
+		SPECIAL_PROPERTIES.add(Environment.DATASOURCE);
+		SPECIAL_PROPERTIES.add(Environment.URL);
+		SPECIAL_PROPERTIES.add(Environment.CONNECTION_PROVIDER);
+		SPECIAL_PROPERTIES.add(Environment.POOL_SIZE);
+		SPECIAL_PROPERTIES.add(Environment.ISOLATION);
+		SPECIAL_PROPERTIES.add(Environment.DRIVER);
+		SPECIAL_PROPERTIES.add(Environment.USER);
 
 	}
 
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * 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 Inc.
+ * 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
@@ -20,16 +20,17 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
+ *
  */
 package org.hibernate.id;
 
 import java.io.Serializable;
 import java.util.Properties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.SessionImplementor;
-import org.hibernate.id.enhanced.AccessCallback;
-import org.hibernate.id.enhanced.OptimizerFactory;
 import org.hibernate.type.Type;
 import org.hibernate.util.PropertiesHelper;
 
@@ -37,7 +38,7 @@ import org.hibernate.util.PropertiesHelp
  * <b>hilo</b><br>
  * <br>
  * An <tt>IdentifierGenerator</tt> that returns a <tt>Long</tt>, constructed using
- * a hi/lo algorithm. The hi value MUST be fetched in a separate transaction
+ * a hi/lo algorithm. The hi value MUST be fetched in a seperate transaction
  * to the <tt>Session</tt> transaction so the generator must be able to obtain
  * a new connection and commit it. Hence this implementation may not
  * be used  when the user is supplying connections. In this
@@ -50,25 +51,26 @@ import org.hibernate.util.PropertiesHelp
  * @author Gavin King
  */
 public class TableHiLoGenerator extends TableGenerator {
+
 	/**
 	 * The max_lo parameter
 	 */
 	public static final String MAX_LO = "max_lo";
 
-	private OptimizerFactory.LegacyHiLoAlgorithmOptimizer hiloOptimizer;
-
 	private int maxLo;
+	private int lo;
+
+	private IntegralDataTypeHolder value;
+
+	private static final Logger log = LoggerFactory.getLogger(TableHiLoGenerator.class);
 
 	public void configure(Type type, Properties params, Dialect d) {
 		super.configure(type, params, d);
 		maxLo = PropertiesHelper.getInt(MAX_LO, params, Short.MAX_VALUE);
-
-		if ( maxLo >= 1 ) {
-			hiloOptimizer = new OptimizerFactory.LegacyHiLoAlgorithmOptimizer( type.getReturnedClass(), maxLo );
-		}
+		lo = maxLo + 1; // so we "clock over" on the first invocation
 	}
 
-	public synchronized Serializable generate(final SessionImplementor session, Object obj) {
+	public synchronized Serializable generate(SessionImplementor session, Object obj) {
 		// maxLo < 1 indicates a hilo generator with no hilo :?
         if ( maxLo < 1 ) {
 			//keep the behavior consistent even for boundary usages
@@ -79,13 +81,16 @@ public class TableHiLoGenerator extends
 			return value.makeValue();
 		}
 
-		return hiloOptimizer.generate(
-				new AccessCallback() {
-					public IntegralDataTypeHolder getNextValue() {
-						return generateHolder( session );
-					}
-				}
-		);
+		if ( lo > maxLo ) {
+			IntegralDataTypeHolder hiVal = generateHolder( session );
+			lo = ( hiVal.eq( 0 ) ) ? 1 : 0;
+			value = hiVal.copy().multiplyBy( maxLo+1 ).add( lo );
+			if ( log.isDebugEnabled() ) {
+				log.debug("new hi value: " + hiVal);
+			}
+		}
+
+		return value.makeValueThenIncrement();
 	}
 
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
@@ -61,12 +61,10 @@ public class SequenceHiLoGenerator exten
 
 		maxLo = PropertiesHelper.getInt( MAX_LO, params, 9 );
 
-		if ( maxLo >= 1 ) {
-			hiloOptimizer = new OptimizerFactory.LegacyHiLoAlgorithmOptimizer(
-					getIdentifierType().getReturnedClass(),
-					maxLo
-			);
-		}
+		hiloOptimizer = new OptimizerFactory.LegacyHiLoAlgorithmOptimizer(
+				getIdentifierType().getReturnedClass(),
+				maxLo
+		);
 	}
 
 	public synchronized Serializable generate(final SessionImplementor session, Object obj) {
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
@@ -186,14 +186,15 @@ public class OptimizerFactory {
 		 * {@inheritDoc}
 		 */
 		public Serializable generate(AccessCallback callback) {
-			// IMPL NOTE : it is incredibly important that the method-local variable be used here to
-			//		avoid concurrency issues.
-			IntegralDataTypeHolder value = null;
-			while ( value == null || value.lt( 1 ) ) {
-				value = callback.getNextValue();
+			if ( lastSourceValue == null ) {
+				do {
+					lastSourceValue = callback.getNextValue();
+				} while ( lastSourceValue.lt( 1 ) );
 			}
-			lastSourceValue = value;
-			return value.makeValue();
+			else {
+				lastSourceValue = callback.getNextValue();
+			}
+			return lastSourceValue.makeValue();
 		}
 
 		/**
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -1,781 +1,635 @@
-/*
- * 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 Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * 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.persister.entity;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.hibernate.AssertionFailure;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.MappingException;
-import org.hibernate.QueryException;
-import org.hibernate.cache.access.EntityRegionAccessStrategy;
-import org.hibernate.engine.ExecuteUpdateResultCheckStyle;
-import org.hibernate.engine.Mapping;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.Versioning;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Join;
-import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Selectable;
-import org.hibernate.mapping.Subclass;
-import org.hibernate.mapping.Table;
-import org.hibernate.sql.CaseFragment;
-import org.hibernate.sql.SelectFragment;
-import org.hibernate.type.AbstractType;
-import org.hibernate.type.Type;
-import org.hibernate.util.ArrayHelper;
-
-/**
- * An <tt>EntityPersister</tt> implementing the normalized "table-per-subclass"
- * mapping strategy
- *
- * @author Gavin King
- */
-public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
-
-	// the class hierarchy structure
-	private final int tableSpan;
-	private final String[] tableNames;
-	private final String[] naturalOrderTableNames;
-	private final String[][] tableKeyColumns;
-	private final String[][] tableKeyColumnReaders;
-	private final String[][] tableKeyColumnReaderTemplates;
-	private final String[][] naturalOrderTableKeyColumns;
-	private final String[][] naturalOrderTableKeyColumnReaders;
-	private final String[][] naturalOrderTableKeyColumnReaderTemplates;
-	private final boolean[] naturalOrderCascadeDeleteEnabled;
-
-	private final String[] spaces;
-
-	private final String[] subclassClosure;
-
-	private final String[] subclassTableNameClosure;
-	private final String[][] subclassTableKeyColumnClosure;
-	private final boolean[] isClassOrSuperclassTable;
-
-	// properties of this class, including inherited properties
-	private final int[] naturalOrderPropertyTableNumbers;
-	private final int[] propertyTableNumbers;
-
-	// the closure of all properties in the entire hierarchy including
-	// subclasses and superclasses of this class
-	private final int[] subclassPropertyTableNumberClosure;
-
-	// the closure of all columns used by the entire hierarchy including
-	// subclasses and superclasses of this class
-	private final int[] subclassColumnTableNumberClosure;
-	private final int[] subclassFormulaTableNumberClosure;
-
-	private final boolean[] subclassTableSequentialSelect;
-	private final boolean[] subclassTableIsLazyClosure;
-	
-	// subclass discrimination works by assigning particular
-	// values to certain combinations of null primary key
-	// values in the outer join using an SQL CASE
-	private final Map subclassesByDiscriminatorValue = new HashMap();
-	private final String[] discriminatorValues;
-	private final String[] notNullColumnNames;
-	private final int[] notNullColumnTableNumbers;
-
-	private final String[] constraintOrderedTableNames;
-	private final String[][] constraintOrderedKeyColumnNames;
-
-	private final String discriminatorSQLString;
-
-	//INITIALIZATION:
-
-	public JoinedSubclassEntityPersister(
-			final PersistentClass persistentClass,
-			final EntityRegionAccessStrategy cacheAccessStrategy,
-			final SessionFactoryImplementor factory,
-			final Mapping mapping) throws HibernateException {
-
-		super( persistentClass, cacheAccessStrategy, factory );
-
-		// DISCRIMINATOR
-
-		final Object discriminatorValue;
-		if ( persistentClass.isPolymorphic() ) {
-			try {
-				discriminatorValue = new Integer( persistentClass.getSubclassId() );
-				discriminatorSQLString = discriminatorValue.toString();
-			}
-			catch (Exception e) {
-				throw new MappingException("Could not format discriminator value to SQL string", e );
-			}
-		}
-		else {
-			discriminatorValue = null;
-			discriminatorSQLString = null;
-		}
-
-		if ( optimisticLockMode() > Versioning.OPTIMISTIC_LOCK_VERSION ) {
-			throw new MappingException( "optimistic-lock=all|dirty not supported for joined-subclass mappings [" + getEntityName() + "]" );
-		}
-
-		//MULTITABLES
-
-		final int idColumnSpan = getIdentifierColumnSpan();
-
-		ArrayList tables = new ArrayList();
-		ArrayList keyColumns = new ArrayList();
-		ArrayList keyColumnReaders = new ArrayList();
-		ArrayList keyColumnReaderTemplates = new ArrayList();
-		ArrayList cascadeDeletes = new ArrayList();
-		Iterator titer = persistentClass.getTableClosureIterator();
-		Iterator kiter = persistentClass.getKeyClosureIterator();
-		while ( titer.hasNext() ) {
-			Table tab = (Table) titer.next();
-			KeyValue key = (KeyValue) kiter.next();
-			String tabname = tab.getQualifiedName(
-					factory.getDialect(),
-					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName()
-			);
-			tables.add(tabname);
-			String[] keyCols = new String[idColumnSpan];
-			String[] keyColReaders = new String[idColumnSpan];
-			String[] keyColReaderTemplates = new String[idColumnSpan];
-			Iterator citer = key.getColumnIterator();
-			for ( int k=0; k<idColumnSpan; k++ ) {
-				Column column = (Column) citer.next();
-				keyCols[k] = column.getQuotedName( factory.getDialect() );
-				keyColReaders[k] = column.getReadExpr( factory.getDialect() );
-				keyColReaderTemplates[k] = column.getTemplate( factory.getDialect(), factory.getSqlFunctionRegistry() );
-			}
-			keyColumns.add(keyCols);
-			keyColumnReaders.add(keyColReaders);
-			keyColumnReaderTemplates.add(keyColReaderTemplates);
-			cascadeDeletes.add( new Boolean( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) );
-		}
-		
-		//Span of the tables directly mapped by this entity and super-classes, if any
-		int coreTableSpan = tables.size();
-		
-		Iterator joinIter = persistentClass.getJoinClosureIterator();
-		while ( joinIter.hasNext() ) {
-			Join join = (Join) joinIter.next();
-			
-			Table tab = join.getTable();
-			 
-			String tabname = tab.getQualifiedName(
-					factory.getDialect(),
-					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName()
-			);
-			tables.add(tabname);
-			
-			KeyValue key = join.getKey();
-			int joinIdColumnSpan = 	key.getColumnSpan();		
-			
-			String[] keyCols = new String[joinIdColumnSpan];
-			String[] keyColReaders = new String[joinIdColumnSpan];
-			String[] keyColReaderTemplates = new String[joinIdColumnSpan];
-						
-			Iterator citer = key.getColumnIterator();
-			
-			for ( int k=0; k<joinIdColumnSpan; k++ ) {
-				Column column = (Column) citer.next();
-				keyCols[k] = column.getQuotedName( factory.getDialect() );
-				keyColReaders[k] = column.getReadExpr( factory.getDialect() );
-				keyColReaderTemplates[k] = column.getTemplate( factory.getDialect(), factory.getSqlFunctionRegistry() );
-			}
-			keyColumns.add(keyCols);
-			keyColumnReaders.add(keyColReaders);
-			keyColumnReaderTemplates.add(keyColReaderTemplates);
-			cascadeDeletes.add( new Boolean( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) );
-		}
-		
-		naturalOrderTableNames = ArrayHelper.toStringArray(tables);
-		naturalOrderTableKeyColumns = ArrayHelper.to2DStringArray(keyColumns);
-		naturalOrderTableKeyColumnReaders = ArrayHelper.to2DStringArray(keyColumnReaders);
-		naturalOrderTableKeyColumnReaderTemplates = ArrayHelper.to2DStringArray(keyColumnReaderTemplates);
-		naturalOrderCascadeDeleteEnabled = ArrayHelper.toBooleanArray(cascadeDeletes);
-
-		ArrayList subtables = new ArrayList();
-		ArrayList isConcretes = new ArrayList();
-		ArrayList isDeferreds = new ArrayList();
-		ArrayList isLazies = new ArrayList();
-		
-		keyColumns = new ArrayList();
-		titer = persistentClass.getSubclassTableClosureIterator();
-		while ( titer.hasNext() ) {
-			Table tab = (Table) titer.next();
-			isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassTable(tab) ) );
-			isDeferreds.add(Boolean.FALSE);
-			isLazies.add(Boolean.FALSE);
-			String tabname = tab.getQualifiedName(
-					factory.getDialect(),
-					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName()
-			);
-			subtables.add(tabname);
-			String[] key = new String[idColumnSpan];
-			Iterator citer = tab.getPrimaryKey().getColumnIterator();
-			for ( int k=0; k<idColumnSpan; k++ ) {
-				key[k] = ( (Column) citer.next() ).getQuotedName( factory.getDialect() );
-			}
-			keyColumns.add(key);
-		}
-		
-		//Add joins
-		joinIter = persistentClass.getSubclassJoinClosureIterator();
-		while ( joinIter.hasNext() ) {
-			Join join = (Join) joinIter.next();
-			
-			Table tab = join.getTable();
-			 
-			isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassTable(tab) ) );
-			isDeferreds.add( new Boolean( join.isSequentialSelect() ) );
-			isLazies.add(new Boolean(join.isLazy()));
-			
-			String tabname = tab.getQualifiedName(
-					factory.getDialect(),
-					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName()
-			);
-			subtables.add(tabname);
-			String[] key = new String[idColumnSpan];
-			Iterator citer = tab.getPrimaryKey().getColumnIterator();
-			for ( int k=0; k<idColumnSpan; k++ ) {
-				key[k] = ( (Column) citer.next() ).getQuotedName( factory.getDialect() );
-			}
-			keyColumns.add(key);
-						
-		}
-				
-		String [] naturalOrderSubclassTableNameClosure = ArrayHelper.toStringArray(subtables);
-		String[][] naturalOrderSubclassTableKeyColumnClosure = ArrayHelper.to2DStringArray(keyColumns);
-		isClassOrSuperclassTable = ArrayHelper.toBooleanArray(isConcretes);
-		subclassTableSequentialSelect = ArrayHelper.toBooleanArray(isDeferreds);
-		subclassTableIsLazyClosure = ArrayHelper.toBooleanArray(isLazies);
-		
-		constraintOrderedTableNames = new String[naturalOrderSubclassTableNameClosure.length];
-		constraintOrderedKeyColumnNames = new String[naturalOrderSubclassTableNameClosure.length][];
-		int currentPosition = 0;
-		for ( int i = naturalOrderSubclassTableNameClosure.length - 1; i >= 0 ; i--, currentPosition++ ) {
-			constraintOrderedTableNames[currentPosition] = naturalOrderSubclassTableNameClosure[i];
-			constraintOrderedKeyColumnNames[currentPosition] = naturalOrderSubclassTableKeyColumnClosure[i];
-		} 
-
-		/**
-		 * Suppose an entity Client extends Person, mapped to the tables CLIENT and PERSON respectively.
-		 * For the Client entity:
-		 * naturalOrderTableNames -> PERSON, CLIENT; this reflects the sequence in which the tables are 
-		 * added to the meta-data when the annotated entities are processed.
-		 * However, in some instances, for example when generating joins, the CLIENT table needs to be 
-		 * the first table as it will the driving table.
-		 * tableNames -> CLIENT, PERSON
-		 */
-				
-		tableSpan = naturalOrderTableNames.length;
- 		tableNames = reverse(naturalOrderTableNames, coreTableSpan);
-		tableKeyColumns = reverse(naturalOrderTableKeyColumns, coreTableSpan);
-		tableKeyColumnReaders = reverse(naturalOrderTableKeyColumnReaders, coreTableSpan);
-		tableKeyColumnReaderTemplates = reverse(naturalOrderTableKeyColumnReaderTemplates, coreTableSpan);
-		subclassTableNameClosure = reverse(naturalOrderSubclassTableNameClosure, coreTableSpan);
-		subclassTableKeyColumnClosure = reverse(naturalOrderSubclassTableKeyColumnClosure, coreTableSpan);
- 
-		spaces = ArrayHelper.join(
-				tableNames,
-				ArrayHelper.toStringArray( persistentClass.getSynchronizedTables() )
-		);
-
-		// Custom sql
-		customSQLInsert = new String[tableSpan];
-		customSQLUpdate = new String[tableSpan];
-		customSQLDelete = new String[tableSpan];
-		insertCallable = new boolean[tableSpan];
-		updateCallable = new boolean[tableSpan];
-		deleteCallable = new boolean[tableSpan];
-		insertResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
-		updateResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
-		deleteResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
-
-		PersistentClass pc = persistentClass;
-		int jk = coreTableSpan-1;
-		while (pc!=null) {
-			customSQLInsert[jk] = pc.getCustomSQLInsert();
-			insertCallable[jk] = customSQLInsert[jk] != null && pc.isCustomInsertCallable();
-			insertResultCheckStyles[jk] = pc.getCustomSQLInsertCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[jk], insertCallable[jk] )
-		                                  : pc.getCustomSQLInsertCheckStyle();
-			customSQLUpdate[jk] = pc.getCustomSQLUpdate();
-			updateCallable[jk] = customSQLUpdate[jk] != null && pc.isCustomUpdateCallable();
-			updateResultCheckStyles[jk] = pc.getCustomSQLUpdateCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[jk], updateCallable[jk] )
-		                                  : pc.getCustomSQLUpdateCheckStyle();
-			customSQLDelete[jk] = pc.getCustomSQLDelete();
-			deleteCallable[jk] = customSQLDelete[jk] != null && pc.isCustomDeleteCallable();
-			deleteResultCheckStyles[jk] = pc.getCustomSQLDeleteCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[jk], deleteCallable[jk] )
-		                                  : pc.getCustomSQLDeleteCheckStyle();
-			jk--;
-			pc = pc.getSuperclass();
-		}
-		
-		if ( jk != -1 ) {
-			throw new AssertionFailure( "Tablespan does not match height of joined-subclass hiearchy." );
-		}
- 
-		joinIter = persistentClass.getJoinClosureIterator();
-		int j = coreTableSpan;
-		while ( joinIter.hasNext() ) {
-			Join join = (Join) joinIter.next();
-			
-			customSQLInsert[j] = join.getCustomSQLInsert();
-			insertCallable[j] = customSQLInsert[j] != null && join.isCustomInsertCallable();
-			insertResultCheckStyles[j] = join.getCustomSQLInsertCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[j], insertCallable[j] )
-		                                  : join.getCustomSQLInsertCheckStyle();
-			customSQLUpdate[j] = join.getCustomSQLUpdate();
-			updateCallable[j] = customSQLUpdate[j] != null && join.isCustomUpdateCallable();
-			updateResultCheckStyles[j] = join.getCustomSQLUpdateCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[j], updateCallable[j] )
-		                                  : join.getCustomSQLUpdateCheckStyle();
-			customSQLDelete[j] = join.getCustomSQLDelete();
-			deleteCallable[j] = customSQLDelete[j] != null && join.isCustomDeleteCallable();
-			deleteResultCheckStyles[j] = join.getCustomSQLDeleteCheckStyle() == null
-			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[j], deleteCallable[j] )
-		                                  : join.getCustomSQLDeleteCheckStyle();
-			j++;
-		}
-		
-		// PROPERTIES
-		int hydrateSpan = getPropertySpan();
-		naturalOrderPropertyTableNumbers = new int[hydrateSpan];
-		propertyTableNumbers = new int[hydrateSpan];
-		Iterator iter = persistentClass.getPropertyClosureIterator();
-		int i=0;
-		while( iter.hasNext() ) {
-			Property prop = (Property) iter.next();
-			String tabname = prop.getValue().getTable().getQualifiedName(
-				factory.getDialect(),
-				factory.getSettings().getDefaultCatalogName(),
-				factory.getSettings().getDefaultSchemaName()
-			);
-			propertyTableNumbers[i] = getTableId(tabname, tableNames);
-			naturalOrderPropertyTableNumbers[i] = getTableId(tabname, naturalOrderTableNames);
-			i++;
-		}
-
-		// subclass closure properties
-
-		//TODO: code duplication with SingleTableEntityPersister
-
-		ArrayList columnTableNumbers = new ArrayList();
-		ArrayList formulaTableNumbers = new ArrayList();
-		ArrayList propTableNumbers = new ArrayList();
-
-		iter = persistentClass.getSubclassPropertyClosureIterator();
-		while ( iter.hasNext() ) {
-			Property prop = (Property) iter.next();
-			Table tab = prop.getValue().getTable();
-			String tabname = tab.getQualifiedName(
-					factory.getDialect(),
-					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName()
-			);
-			Integer tabnum = new Integer( getTableId(tabname, subclassTableNameClosure) );
-  			propTableNumbers.add(tabnum);
-
-			Iterator citer = prop.getColumnIterator();
-			while ( citer.hasNext() ) {
-				Selectable thing = (Selectable) citer.next();
-				if ( thing.isFormula() ) {
-					formulaTableNumbers.add(tabnum);
-				}
-				else {
-					columnTableNumbers.add(tabnum);
-				}
-			}
-
-		}
-
-		subclassColumnTableNumberClosure = ArrayHelper.toIntArray(columnTableNumbers);
-		subclassPropertyTableNumberClosure = ArrayHelper.toIntArray(propTableNumbers);
-		subclassFormulaTableNumberClosure = ArrayHelper.toIntArray(formulaTableNumbers);
-
-		// SUBCLASSES
- 
-		int subclassSpan = persistentClass.getSubclassSpan() + 1;
-		subclassClosure = new String[subclassSpan];
-		subclassClosure[subclassSpan-1] = getEntityName();
-		if ( persistentClass.isPolymorphic() ) {
-			subclassesByDiscriminatorValue.put( discriminatorValue, getEntityName() );
-			discriminatorValues = new String[subclassSpan];
-			discriminatorValues[subclassSpan-1] = discriminatorSQLString;
-			notNullColumnTableNumbers = new int[subclassSpan];
-			final int id = getTableId(
-				persistentClass.getTable().getQualifiedName(
-						factory.getDialect(),
-						factory.getSettings().getDefaultCatalogName(),
-						factory.getSettings().getDefaultSchemaName()
-				),
-				subclassTableNameClosure
-			);
-			notNullColumnTableNumbers[subclassSpan-1] = id;
-			notNullColumnNames = new String[subclassSpan];
-			notNullColumnNames[subclassSpan-1] =  subclassTableKeyColumnClosure[id][0]; //( (Column) model.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
-		}
-		else {
-			discriminatorValues = null;
-			notNullColumnTableNumbers = null;
-			notNullColumnNames = null;
-		}
-
-		iter = persistentClass.getSubclassIterator();
-		int k=0;
-		while ( iter.hasNext() ) {
-			Subclass sc = (Subclass) iter.next();
-			subclassClosure[k] = sc.getEntityName();
-			try {
-				if ( persistentClass.isPolymorphic() ) {
-					// we now use subclass ids that are consistent across all
-					// persisters for a class hierarchy, so that the use of
-					// "foo.class = Bar" works in HQL
-					Integer subclassId = new Integer( sc.getSubclassId() );//new Integer(k+1);
-					subclassesByDiscriminatorValue.put( subclassId, sc.getEntityName() );
-					discriminatorValues[k] = subclassId.toString();
-					int id = getTableId(
-						sc.getTable().getQualifiedName(
-								factory.getDialect(),
-								factory.getSettings().getDefaultCatalogName(),
-								factory.getSettings().getDefaultSchemaName()
-						),
-						subclassTableNameClosure
-					);
-					notNullColumnTableNumbers[k] = id;
-					notNullColumnNames[k] = subclassTableKeyColumnClosure[id][0]; //( (Column) sc.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
-				}
-			}
-			catch (Exception e) {
-				throw new MappingException("Error parsing discriminator value", e );
-			}
-			k++;
-		}
-
-		initLockers();
-
-		initSubclassPropertyAliasesMap(persistentClass);
-
-		postConstruct(mapping);
-
-	}
-
-	protected boolean isSubclassTableSequentialSelect(int j) {
-		return subclassTableSequentialSelect[j] && !isClassOrSuperclassTable[j];
-	}
-	
-	
-	/*public void postInstantiate() throws MappingException {
-		super.postInstantiate();
-		//TODO: other lock modes?
-		loader = createEntityLoader(LockMode.NONE, CollectionHelper.EMPTY_MAP);
-	}*/
-
-	public String getSubclassPropertyTableName(int i) {
-		return subclassTableNameClosure[ subclassPropertyTableNumberClosure[i] ];
-	}
-
-	public Type getDiscriminatorType() {
-		return Hibernate.INTEGER;
-	}
-
-	public String getDiscriminatorSQLValue() {
-		return discriminatorSQLString;
-	}
-
-
-	public String getSubclassForDiscriminatorValue(Object value) {
-		return (String) subclassesByDiscriminatorValue.get(value);
-	}
-
-	public Serializable[] getPropertySpaces() {
-		return spaces; // don't need subclass tables, because they can't appear in conditions
-	}
-
-
-	protected String getTableName(int j) {
-		return naturalOrderTableNames[j];
-	}
-
-	protected String[] getKeyColumns(int j) {
-		return naturalOrderTableKeyColumns[j];
-	}
-
-	protected boolean isTableCascadeDeleteEnabled(int j) {
-		return naturalOrderCascadeDeleteEnabled[j];
-	}
-
-	protected boolean isPropertyOfTable(int property, int j) {
-		return naturalOrderPropertyTableNumbers[property]==j;
-	}
-
-	/**
-	 * Load an instance using either the <tt>forUpdateLoader</tt> or the outer joining <tt>loader</tt>,
-	 * depending upon the value of the <tt>lock</tt> parameter
-	 */
-	/*public Object load(Serializable id,	Object optionalObject, LockMode lockMode, SessionImplementor session)
-	throws HibernateException {
-
-		if ( log.isTraceEnabled() ) log.trace( "Materializing entity: " + MessageHelper.infoString(this, id) );
-
-		final UniqueEntityLoader loader = hasQueryLoader() ?
-				getQueryLoader() :
-				this.loader;
-		try {
-
-			final Object result = loader.load(id, optionalObject, session);
-
-			if (result!=null) lock(id, getVersion(result), result, lockMode, session);
-
-			return result;
-
-		}
-		catch (SQLException sqle) {
-			throw new JDBCException( "could not load by id: " +  MessageHelper.infoString(this, id), sqle );
-		}
-	}*/
-
-	private static final void reverse(Object[] objects, int len) {
-		Object[] temp = new Object[len];
-		for (int i=0; i<len; i++) {
-			temp[i] = objects[len-i-1];
-		}
-		for (int i=0; i<len; i++) {
-			objects[i] = temp[i];
-		}
-	}
-
-	
-	/**
-	 * Reverse the first n elements of the incoming array
-	 * @param objects
-	 * @param n
-	 * @return New array with the first n elements in reversed order 
-	 */
-	private static final String[] reverse(String [] objects, int n) {
-		
-		int size = objects.length;
-		String[] temp = new String[size];
-		
-		for (int i=0; i<n; i++) {
-			temp[i] = objects[n-i-1];
-		}
-		
-		for (int i=n; i < size; i++) {
-			temp[i] =  objects[i];
-		}
-		
-		return temp;
-	}
-		
-	/**
-	 * Reverse the first n elements of the incoming array
-	 * @param objects
-	 * @param n
-	 * @return New array with the first n elements in reversed order 
-	 */
-	private static final String[][] reverse(String[][] objects, int n) {
-		int size = objects.length;
-		String[][] temp = new String[size][];
-		for (int i=0; i<n; i++) {
-			temp[i] = objects[n-i-1];
-		}
-		
-		for (int i=n; i<size; i++) {
-			temp[i] = objects[i];
-		}
-		
-		return temp;
-	}
-	
-	
-	
-	public String fromTableFragment(String alias) {
-		return getTableName() + ' ' + alias;
-	}
-
-	public String getTableName() {
-		return tableNames[0];
-	}
-
-	private static int getTableId(String tableName, String[] tables) {
-		for ( int j=0; j<tables.length; j++ ) {
-			if ( tableName.equals( tables[j] ) ) {
-				return j;
-			}
-		}
-		throw new AssertionFailure("Table " + tableName + " not found");
-	}
-
-	public void addDiscriminatorToSelect(SelectFragment select, String name, String suffix) {
-		if ( hasSubclasses() ) {
-			select.setExtraSelectList( discriminatorFragment(name), getDiscriminatorAlias() );
-		}
-	}
-
-	private CaseFragment discriminatorFragment(String alias) {
-		CaseFragment cases = getFactory().getDialect().createCaseFragment();
-
-		for ( int i=0; i<discriminatorValues.length; i++ ) {
-			cases.addWhenColumnNotNull(
-				generateTableAlias( alias, notNullColumnTableNumbers[i] ),
-				notNullColumnNames[i],
-				discriminatorValues[i]
-			);
-		}
-
-		return cases;
-	}
-
-	public String filterFragment(String alias) {
-		return hasWhere() ?
-			" and " + getSQLWhereString( generateFilterConditionAlias( alias ) ) :
-			"";
-	}
-
-	public String generateFilterConditionAlias(String rootAlias) {
-		return generateTableAlias( rootAlias, tableSpan-1 );
-	}
-
-	public String[] getIdentifierColumnNames() {
-		return tableKeyColumns[0];
-	}
-
-	public String[] getIdentifierColumnReaderTemplates() {
-		return tableKeyColumnReaderTemplates[0];
-	}
-
-	public String[] getIdentifierColumnReaders() {
-		return tableKeyColumnReaders[0];
-	}		
-	
-	public String[] toColumns(String alias, String propertyName) throws QueryException {
-
-		if ( ENTITY_CLASS.equals(propertyName) ) {
-			// This doesn't actually seem to work but it *might*
-			// work on some dbs. Also it doesn't work if there
-			// are multiple columns of results because it
-			// is not accounting for the suffix:
-			// return new String[] { getDiscriminatorColumnName() };
-
-			return new String[] { discriminatorFragment(alias).toFragmentString() };
-		}
-		else {
-			return super.toColumns(alias, propertyName);
-		}
-
-	}
-
-	protected int[] getPropertyTableNumbersInSelect() {
-		return propertyTableNumbers;
-	}
-
-	protected int getSubclassPropertyTableNumber(int i) {
-		return subclassPropertyTableNumberClosure[i];
-	}
-
-	public int getTableSpan() {
-		return tableSpan;
-	}
-
-	public boolean isMultiTable() {
-		return true;
-	}
-
-	protected int[] getSubclassColumnTableNumberClosure() {
-		return subclassColumnTableNumberClosure;
-	}
-
-	protected int[] getSubclassFormulaTableNumberClosure() {
-		return subclassFormulaTableNumberClosure;
-	}
-
-	protected int[] getPropertyTableNumbers() {
-		return naturalOrderPropertyTableNumbers;
-	}
-
-	protected String[] getSubclassTableKeyColumns(int j) {
-		return subclassTableKeyColumnClosure[j];
-	}
-
-	public String getSubclassTableName(int j) {
-		return subclassTableNameClosure[j];
-	}
-
-	public int getSubclassTableSpan() {
-		return subclassTableNameClosure.length;
-	}
-
-	protected boolean isSubclassTableLazy(int j) {
-		return subclassTableIsLazyClosure[j];
-	}
-	
-	
-	protected boolean isClassOrSuperclassTable(int j) {
-		return isClassOrSuperclassTable[j];
-	}
-
-	public String getPropertyTableName(String propertyName) {
-		Integer index = getEntityMetamodel().getPropertyIndexOrNull(propertyName);
-		if ( index == null ) {
-			return null;
-		}
-		return tableNames[ propertyTableNumbers[ index.intValue() ] ];
-	}
-
-	public String[] getConstraintOrderedTableNameClosure() {
-		return constraintOrderedTableNames;
-	}
-
-	public String[][] getContraintOrderedTableKeyColumnClosure() {
-		return constraintOrderedKeyColumnNames;
-	}
-
-	public String getRootTableName() {
-		return naturalOrderTableNames[0];
-	}
-
-	public String getRootTableAlias(String drivingAlias) {
-		return generateTableAlias( drivingAlias, getTableId( getRootTableName(), tableNames ) );
-	}
-
-	public Declarer getSubclassPropertyDeclarer(String propertyPath) {
-		if ( "class".equals( propertyPath ) ) {
-			// special case where we need to force incloude all subclass joins
-			return Declarer.SUBCLASS;
-		}
-		return super.getSubclassPropertyDeclarer( propertyPath );
-	}
-}
+/*
+ * 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 Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * 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.persister.entity;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.QueryException;
+import org.hibernate.cache.access.EntityRegionAccessStrategy;
+import org.hibernate.engine.ExecuteUpdateResultCheckStyle;
+import org.hibernate.engine.Mapping;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.Versioning;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.KeyValue;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.Table;
+import org.hibernate.sql.CaseFragment;
+import org.hibernate.sql.SelectFragment;
+import org.hibernate.type.AbstractType;
+import org.hibernate.type.Type;
+import org.hibernate.util.ArrayHelper;
+
+/**
+ * An <tt>EntityPersister</tt> implementing the normalized "table-per-subclass"
+ * mapping strategy
+ *
+ * @author Gavin King
+ */
+public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
+
+	// the class hierarchy structure
+	private final int tableSpan;
+	private final String[] tableNames;
+	private final String[] naturalOrderTableNames;
+	private final String[][] tableKeyColumns;
+	private final String[][] tableKeyColumnReaders;
+	private final String[][] tableKeyColumnReaderTemplates;
+	private final String[][] naturalOrderTableKeyColumns;
+	private final String[][] naturalOrderTableKeyColumnReaders;
+	private final String[][] naturalOrderTableKeyColumnReaderTemplates;
+	private final boolean[] naturalOrderCascadeDeleteEnabled;
+
+	private final String[] spaces;
+
+	private final String[] subclassClosure;
+
+	private final String[] subclassTableNameClosure;
+	private final String[][] subclassTableKeyColumnClosure;
+	private final boolean[] isClassOrSuperclassTable;
+
+	// properties of this class, including inherited properties
+	private final int[] naturalOrderPropertyTableNumbers;
+	private final int[] propertyTableNumbers;
+
+	// the closure of all properties in the entire hierarchy including
+	// subclasses and superclasses of this class
+	private final int[] subclassPropertyTableNumberClosure;
+
+	// the closure of all columns used by the entire hierarchy including
+	// subclasses and superclasses of this class
+	private final int[] subclassColumnTableNumberClosure;
+	private final int[] subclassFormulaTableNumberClosure;
+
+	// subclass discrimination works by assigning particular
+	// values to certain combinations of null primary key
+	// values in the outer join using an SQL CASE
+	private final Map subclassesByDiscriminatorValue = new HashMap();
+	private final String[] discriminatorValues;
+	private final String[] notNullColumnNames;
+	private final int[] notNullColumnTableNumbers;
+
+	private final String[] constraintOrderedTableNames;
+	private final String[][] constraintOrderedKeyColumnNames;
+
+	private final String discriminatorSQLString;
+
+	//INITIALIZATION:
+
+	public JoinedSubclassEntityPersister(
+			final PersistentClass persistentClass,
+			final EntityRegionAccessStrategy cacheAccessStrategy,
+			final SessionFactoryImplementor factory,
+			final Mapping mapping) throws HibernateException {
+
+		super( persistentClass, cacheAccessStrategy, factory );
+
+		// DISCRIMINATOR
+
+		final Object discriminatorValue;
+		if ( persistentClass.isPolymorphic() ) {
+			try {
+				discriminatorValue = new Integer( persistentClass.getSubclassId() );
+				discriminatorSQLString = discriminatorValue.toString();
+			}
+			catch (Exception e) {
+				throw new MappingException("Could not format discriminator value to SQL string", e );
+			}
+		}
+		else {
+			discriminatorValue = null;
+			discriminatorSQLString = null;
+		}
+
+		if ( optimisticLockMode() > Versioning.OPTIMISTIC_LOCK_VERSION ) {
+			throw new MappingException( "optimistic-lock=all|dirty not supported for joined-subclass mappings [" + getEntityName() + "]" );
+		}
+
+		//MULTITABLES
+
+		final int idColumnSpan = getIdentifierColumnSpan();
+
+		ArrayList tables = new ArrayList();
+		ArrayList keyColumns = new ArrayList();
+		ArrayList keyColumnReaders = new ArrayList();
+		ArrayList keyColumnReaderTemplates = new ArrayList();
+		ArrayList cascadeDeletes = new ArrayList();
+		Iterator titer = persistentClass.getTableClosureIterator();
+		Iterator kiter = persistentClass.getKeyClosureIterator();
+		while ( titer.hasNext() ) {
+			Table tab = (Table) titer.next();
+			KeyValue key = (KeyValue) kiter.next();
+			String tabname = tab.getQualifiedName(
+					factory.getDialect(),
+					factory.getSettings().getDefaultCatalogName(),
+					factory.getSettings().getDefaultSchemaName()
+			);
+			tables.add(tabname);
+			String[] keyCols = new String[idColumnSpan];
+			String[] keyColReaders = new String[idColumnSpan];
+			String[] keyColReaderTemplates = new String[idColumnSpan];
+			Iterator citer = key.getColumnIterator();
+			for ( int k=0; k<idColumnSpan; k++ ) {
+				Column column = (Column) citer.next();
+				keyCols[k] = column.getQuotedName( factory.getDialect() );
+				keyColReaders[k] = column.getReadExpr( factory.getDialect() );
+				keyColReaderTemplates[k] = column.getTemplate( factory.getDialect(), factory.getSqlFunctionRegistry() );
+			}
+			keyColumns.add(keyCols);
+			keyColumnReaders.add(keyColReaders);
+			keyColumnReaderTemplates.add(keyColReaderTemplates);
+			cascadeDeletes.add( new Boolean( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) );
+		}
+		naturalOrderTableNames = ArrayHelper.toStringArray(tables);
+		naturalOrderTableKeyColumns = ArrayHelper.to2DStringArray(keyColumns);
+		naturalOrderTableKeyColumnReaders = ArrayHelper.to2DStringArray(keyColumnReaders);
+		naturalOrderTableKeyColumnReaderTemplates = ArrayHelper.to2DStringArray(keyColumnReaderTemplates);
+		naturalOrderCascadeDeleteEnabled = ArrayHelper.toBooleanArray(cascadeDeletes);
+
+		ArrayList subtables = new ArrayList();
+		ArrayList isConcretes = new ArrayList();
+		keyColumns = new ArrayList();
+		titer = persistentClass.getSubclassTableClosureIterator();
+		while ( titer.hasNext() ) {
+			Table tab = (Table) titer.next();
+			isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassTable(tab) ) );
+			String tabname = tab.getQualifiedName(
+					factory.getDialect(),
+					factory.getSettings().getDefaultCatalogName(),
+					factory.getSettings().getDefaultSchemaName()
+			);
+			subtables.add(tabname);
+			String[] key = new String[idColumnSpan];
+			Iterator citer = tab.getPrimaryKey().getColumnIterator();
+			for ( int k=0; k<idColumnSpan; k++ ) {
+				key[k] = ( (Column) citer.next() ).getQuotedName( factory.getDialect() );
+			}
+			keyColumns.add(key);
+		}
+		subclassTableNameClosure = ArrayHelper.toStringArray(subtables);
+		subclassTableKeyColumnClosure = ArrayHelper.to2DStringArray(keyColumns);
+		isClassOrSuperclassTable = ArrayHelper.toBooleanArray(isConcretes);
+
+		constraintOrderedTableNames = new String[subclassTableNameClosure.length];
+		constraintOrderedKeyColumnNames = new String[subclassTableNameClosure.length][];
+		int currentPosition = 0;
+		for ( int i = subclassTableNameClosure.length - 1; i >= 0 ; i--, currentPosition++ ) {
+			constraintOrderedTableNames[currentPosition] = subclassTableNameClosure[i];
+			constraintOrderedKeyColumnNames[currentPosition] = subclassTableKeyColumnClosure[i];
+		}
+
+		tableSpan = naturalOrderTableNames.length;
+		tableNames = reverse(naturalOrderTableNames);
+		tableKeyColumns = reverse(naturalOrderTableKeyColumns);
+		tableKeyColumnReaders = reverse(naturalOrderTableKeyColumnReaders);
+		tableKeyColumnReaderTemplates = reverse(naturalOrderTableKeyColumnReaderTemplates);
+		reverse(subclassTableNameClosure, tableSpan);
+		reverse(subclassTableKeyColumnClosure, tableSpan);
+
+		spaces = ArrayHelper.join(
+				tableNames,
+				ArrayHelper.toStringArray( persistentClass.getSynchronizedTables() )
+		);
+
+		// Custom sql
+		customSQLInsert = new String[tableSpan];
+		customSQLUpdate = new String[tableSpan];
+		customSQLDelete = new String[tableSpan];
+		insertCallable = new boolean[tableSpan];
+		updateCallable = new boolean[tableSpan];
+		deleteCallable = new boolean[tableSpan];
+		insertResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
+		updateResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
+		deleteResultCheckStyles = new ExecuteUpdateResultCheckStyle[tableSpan];
+
+		PersistentClass pc = persistentClass;
+		int jk = tableSpan-1;
+		while (pc!=null) {
+			customSQLInsert[jk] = pc.getCustomSQLInsert();
+			insertCallable[jk] = customSQLInsert[jk] != null && pc.isCustomInsertCallable();
+			insertResultCheckStyles[jk] = pc.getCustomSQLInsertCheckStyle() == null
+			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLInsert[jk], insertCallable[jk] )
+		                                  : pc.getCustomSQLInsertCheckStyle();
+			customSQLUpdate[jk] = pc.getCustomSQLUpdate();
+			updateCallable[jk] = customSQLUpdate[jk] != null && pc.isCustomUpdateCallable();
+			updateResultCheckStyles[jk] = pc.getCustomSQLUpdateCheckStyle() == null
+			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLUpdate[jk], updateCallable[jk] )
+		                                  : pc.getCustomSQLUpdateCheckStyle();
+			customSQLDelete[jk] = pc.getCustomSQLDelete();
+			deleteCallable[jk] = customSQLDelete[jk] != null && pc.isCustomDeleteCallable();
+			deleteResultCheckStyles[jk] = pc.getCustomSQLDeleteCheckStyle() == null
+			                              ? ExecuteUpdateResultCheckStyle.determineDefault( customSQLDelete[jk], deleteCallable[jk] )
+		                                  : pc.getCustomSQLDeleteCheckStyle();
+			jk--;
+			pc = pc.getSuperclass();
+		}
+		if ( jk != -1 ) {
+			throw new AssertionFailure( "Tablespan does not match height of joined-subclass hiearchy." );
+		}
+
+		// PROPERTIES
+
+		int hydrateSpan = getPropertySpan();
+		naturalOrderPropertyTableNumbers = new int[hydrateSpan];
+		propertyTableNumbers = new int[hydrateSpan];
+		Iterator iter = persistentClass.getPropertyClosureIterator();
+		int i=0;
+		while( iter.hasNext() ) {
+			Property prop = (Property) iter.next();
+			String tabname = prop.getValue().getTable().getQualifiedName(
+				factory.getDialect(),
+				factory.getSettings().getDefaultCatalogName(),
+				factory.getSettings().getDefaultSchemaName()
+			);
+			propertyTableNumbers[i] = getTableId(tabname, tableNames);
+			naturalOrderPropertyTableNumbers[i] = getTableId(tabname, naturalOrderTableNames);
+			i++;
+		}
+
+		// subclass closure properties
+
+		//TODO: code duplication with SingleTableEntityPersister
+
+		ArrayList columnTableNumbers = new ArrayList();
+		ArrayList formulaTableNumbers = new ArrayList();
+		ArrayList propTableNumbers = new ArrayList();
+
+		iter = persistentClass.getSubclassPropertyClosureIterator();
+		while ( iter.hasNext() ) {
+			Property prop = (Property) iter.next();
+			Table tab = prop.getValue().getTable();
+			String tabname = tab.getQualifiedName(
+					factory.getDialect(),
+					factory.getSettings().getDefaultCatalogName(),
+					factory.getSettings().getDefaultSchemaName()
+			);
+			Integer tabnum = new Integer( getTableId(tabname, subclassTableNameClosure) );
+			propTableNumbers.add(tabnum);
+
+			Iterator citer = prop.getColumnIterator();
+			while ( citer.hasNext() ) {
+				Selectable thing = (Selectable) citer.next();
+				if ( thing.isFormula() ) {
+					formulaTableNumbers.add(tabnum);
+				}
+				else {
+					columnTableNumbers.add(tabnum);
+				}
+			}
+
+		}
+
+		subclassColumnTableNumberClosure = ArrayHelper.toIntArray(columnTableNumbers);
+		subclassPropertyTableNumberClosure = ArrayHelper.toIntArray(propTableNumbers);
+		subclassFormulaTableNumberClosure = ArrayHelper.toIntArray(formulaTableNumbers);
+
+		// SUBCLASSES
+
+		int subclassSpan = persistentClass.getSubclassSpan() + 1;
+		subclassClosure = new String[subclassSpan];
+		subclassClosure[subclassSpan-1] = getEntityName();
+		if ( persistentClass.isPolymorphic() ) {
+			subclassesByDiscriminatorValue.put( discriminatorValue, getEntityName() );
+			discriminatorValues = new String[subclassSpan];
+			discriminatorValues[subclassSpan-1] = discriminatorSQLString;
+			notNullColumnTableNumbers = new int[subclassSpan];
+			final int id = getTableId(
+				persistentClass.getTable().getQualifiedName(
+						factory.getDialect(),
+						factory.getSettings().getDefaultCatalogName(),
+						factory.getSettings().getDefaultSchemaName()
+				),
+				subclassTableNameClosure
+			);
+			notNullColumnTableNumbers[subclassSpan-1] = id;
+			notNullColumnNames = new String[subclassSpan];
+			notNullColumnNames[subclassSpan-1] =  subclassTableKeyColumnClosure[id][0]; //( (Column) model.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
+		}
+		else {
+			discriminatorValues = null;
+			notNullColumnTableNumbers = null;
+			notNullColumnNames = null;
+		}
+
+		iter = persistentClass.getSubclassIterator();
+		int k=0;
+		while ( iter.hasNext() ) {
+			Subclass sc = (Subclass) iter.next();
+			subclassClosure[k] = sc.getEntityName();
+			try {
+				if ( persistentClass.isPolymorphic() ) {
+					// we now use subclass ids that are consistent across all
+					// persisters for a class hierarchy, so that the use of
+					// "foo.class = Bar" works in HQL
+					Integer subclassId = new Integer( sc.getSubclassId() );//new Integer(k+1);
+					subclassesByDiscriminatorValue.put( subclassId, sc.getEntityName() );
+					discriminatorValues[k] = subclassId.toString();
+					int id = getTableId(
+						sc.getTable().getQualifiedName(
+								factory.getDialect(),
+								factory.getSettings().getDefaultCatalogName(),
+								factory.getSettings().getDefaultSchemaName()
+						),
+						subclassTableNameClosure
+					);
+					notNullColumnTableNumbers[k] = id;
+					notNullColumnNames[k] = subclassTableKeyColumnClosure[id][0]; //( (Column) sc.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
+				}
+			}
+			catch (Exception e) {
+				throw new MappingException("Error parsing discriminator value", e );
+			}
+			k++;
+		}
+
+		initLockers();
+
+		initSubclassPropertyAliasesMap(persistentClass);
+
+		postConstruct(mapping);
+
+	}
+
+	/*public void postInstantiate() throws MappingException {
+		super.postInstantiate();
+		//TODO: other lock modes?
+		loader = createEntityLoader(LockMode.NONE, CollectionHelper.EMPTY_MAP);
+	}*/
+
+	public String getSubclassPropertyTableName(int i) {
+		return subclassTableNameClosure[ subclassPropertyTableNumberClosure[i] ];
+	}
+
+	public Type getDiscriminatorType() {
+		return Hibernate.INTEGER;
+	}
+
+	public String getDiscriminatorSQLValue() {
+		return discriminatorSQLString;
+	}
+
+
+	public String getSubclassForDiscriminatorValue(Object value) {
+		return (String) subclassesByDiscriminatorValue.get(value);
+	}
+
+	public Serializable[] getPropertySpaces() {
+		return spaces; // don't need subclass tables, because they can't appear in conditions
+	}
+
+
+	protected String getTableName(int j) {
+		return naturalOrderTableNames[j];
+	}
+
+	protected String[] getKeyColumns(int j) {
+		return naturalOrderTableKeyColumns[j];
+	}
+
+	protected boolean isTableCascadeDeleteEnabled(int j) {
+		return naturalOrderCascadeDeleteEnabled[j];
+	}
+
+	protected boolean isPropertyOfTable(int property, int j) {
+		return naturalOrderPropertyTableNumbers[property]==j;
+	}
+
+	/**
+	 * Load an instance using either the <tt>forUpdateLoader</tt> or the outer joining <tt>loader</tt>,
+	 * depending upon the value of the <tt>lock</tt> parameter
+	 */
+	/*public Object load(Serializable id,	Object optionalObject, LockMode lockMode, SessionImplementor session)
+	throws HibernateException {
+
+		if ( log.isTraceEnabled() ) log.trace( "Materializing entity: " + MessageHelper.infoString(this, id) );
+
+		final UniqueEntityLoader loader = hasQueryLoader() ?
+				getQueryLoader() :
+				this.loader;
+		try {
+
+			final Object result = loader.load(id, optionalObject, session);
+
+			if (result!=null) lock(id, getVersion(result), result, lockMode, session);
+
+			return result;
+
+		}
+		catch (SQLException sqle) {
+			throw new JDBCException( "could not load by id: " +  MessageHelper.infoString(this, id), sqle );
+		}
+	}*/
+
+	private static final void reverse(Object[] objects, int len) {
+		Object[] temp = new Object[len];
+		for (int i=0; i<len; i++) {
+			temp[i] = objects[len-i-1];
+		}
+		for (int i=0; i<len; i++) {
+			objects[i] = temp[i];
+		}
+	}
+
+	private static final String[] reverse(String[] objects) {
+		int len = objects.length;
+		String[] temp = new String[len];
+		for (int i=0; i<len; i++) {
+			temp[i] = objects[len-i-1];
+		}
+		return temp;
+	}
+
+	private static final String[][] reverse(String[][] objects) {
+		int len = objects.length;
+		String[][] temp = new String[len][];
+		for (int i=0; i<len; i++) {
+			temp[i] = objects[len-i-1];
+		}
+		return temp;
+	}
+
+	public String fromTableFragment(String alias) {
+		return getTableName() + ' ' + alias;
+	}
+
+	public String getTableName() {
+		return tableNames[0];
+	}
+
+	private static int getTableId(String tableName, String[] tables) {
+		for ( int j=0; j<tables.length; j++ ) {
+			if ( tableName.equals( tables[j] ) ) {
+				return j;
+			}
+		}
+		throw new AssertionFailure("Table " + tableName + " not found");
+	}
+
+	public void addDiscriminatorToSelect(SelectFragment select, String name, String suffix) {
+		if ( hasSubclasses() ) {
+			select.setExtraSelectList( discriminatorFragment(name), getDiscriminatorAlias() );
+		}
+	}
+
+	private CaseFragment discriminatorFragment(String alias) {
+		CaseFragment cases = getFactory().getDialect().createCaseFragment();
+
+		for ( int i=0; i<discriminatorValues.length; i++ ) {
+			cases.addWhenColumnNotNull(
+				generateTableAlias( alias, notNullColumnTableNumbers[i] ),
+				notNullColumnNames[i],
+				discriminatorValues[i]
+			);
+		}
+
+		return cases;
+	}
+
+	public String filterFragment(String alias) {
+		return hasWhere() ?
+			" and " + getSQLWhereString( generateFilterConditionAlias( alias ) ) :
+			"";
+	}
+
+	public String generateFilterConditionAlias(String rootAlias) {
+		return generateTableAlias( rootAlias, tableSpan-1 );
+	}
+
+	public String[] getIdentifierColumnNames() {
+		return tableKeyColumns[0];
+	}
+
+	public String[] getIdentifierColumnReaderTemplates() {
+		return tableKeyColumnReaderTemplates[0];
+	}
+
+	public String[] getIdentifierColumnReaders() {
+		return tableKeyColumnReaders[0];
+	}		
+	
+	public String[] toColumns(String alias, String propertyName) throws QueryException {
+
+		if ( ENTITY_CLASS.equals(propertyName) ) {
+			// This doesn't actually seem to work but it *might*
+			// work on some dbs. Also it doesn't work if there
+			// are multiple columns of results because it
+			// is not accounting for the suffix:
+			// return new String[] { getDiscriminatorColumnName() };
+
+			return new String[] { discriminatorFragment(alias).toFragmentString() };
+		}
+		else {
+			return super.toColumns(alias, propertyName);
+		}
+
+	}
+
+	protected int[] getPropertyTableNumbersInSelect() {
+		return propertyTableNumbers;
+	}
+
+	protected int getSubclassPropertyTableNumber(int i) {
+		return subclassPropertyTableNumberClosure[i];
+	}
+
+	public int getTableSpan() {
+		return tableSpan;
+	}
+
+	public boolean isMultiTable() {
+		return true;
+	}
+
+	protected int[] getSubclassColumnTableNumberClosure() {
+		return subclassColumnTableNumberClosure;
+	}
+
+	protected int[] getSubclassFormulaTableNumberClosure() {
+		return subclassFormulaTableNumberClosure;
+	}
+
+	protected int[] getPropertyTableNumbers() {
+		return naturalOrderPropertyTableNumbers;
+	}
+
+	protected String[] getSubclassTableKeyColumns(int j) {
+		return subclassTableKeyColumnClosure[j];
+	}
+
+	public String getSubclassTableName(int j) {
+		return subclassTableNameClosure[j];
+	}
+
+	public int getSubclassTableSpan() {
+		return subclassTableNameClosure.length;
+	}
+
+	protected boolean isClassOrSuperclassTable(int j) {
+		return isClassOrSuperclassTable[j];
+	}
+
+	public String getPropertyTableName(String propertyName) {
+		Integer index = getEntityMetamodel().getPropertyIndexOrNull(propertyName);
+		if ( index == null ) {
+			return null;
+		}
+		return tableNames[ propertyTableNumbers[ index.intValue() ] ];
+	}
+
+	public String[] getConstraintOrderedTableNameClosure() {
+		return constraintOrderedTableNames;
+	}
+
+	public String[][] getContraintOrderedTableKeyColumnClosure() {
+		return constraintOrderedKeyColumnNames;
+	}
+
+	public String getRootTableName() {
+		return naturalOrderTableNames[0];
+	}
+
+	public String getRootTableAlias(String drivingAlias) {
+		return generateTableAlias( drivingAlias, getTableId( getRootTableName(), tableNames ) );
+	}
+
+	public Declarer getSubclassPropertyDeclarer(String propertyPath) {
+		if ( "class".equals( propertyPath ) ) {
+			// special case where we need to force incloude all subclass joins
+			return Declarer.SUBCLASS;
+		}
+		return super.getSubclassPropertyDeclarer( propertyPath );
+	}
+}
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
@@ -293,7 +293,6 @@ public class StatisticsImpl implements S
 		if (hql!=null) {
 			QueryStatisticsImpl qs = (QueryStatisticsImpl) getQueryStatistics(hql);
 			qs.executed(rows, time);
-			log.info("HQL: {}, time: {}ms, rows: {}", new Object[]{hql, new Long(time), new Long(rows)});
 		}
 	}
 	
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/tuple/Instantiator.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/tuple/Instantiator.java
@@ -56,7 +56,7 @@ public interface Instantiator extends Se
 	 * or component which this Instantiator instantiates.
 	 *
 	 * @param object The object to be checked.
-	 * @return True is the object does represent an instance of the underlying
+	 * @return True is the object does respresent an instance of the underlying
 	 * entity/component.
 	 */
 	public boolean isInstance(Object object);
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -122,7 +122,7 @@ public class EntityMetamodel implements
 	private final boolean inherited;
 	private final boolean hasSubclasses;
 	private final Set subclassEntityNames = new HashSet();
-	private final Map entityNameByInheritenceClassMap = new HashMap();
+	private final Map entityNameByInheritenceClassNameMap = new HashMap();
 
 	private final EntityEntityModeToTuplizerMapping tuplizerMapping;
 
@@ -312,11 +312,11 @@ public class EntityMetamodel implements
 		subclassEntityNames.add( name );
 
 		if ( persistentClass.hasPojoRepresentation() ) {
-			entityNameByInheritenceClassMap.put( persistentClass.getMappedClass(), persistentClass.getEntityName() );
+			entityNameByInheritenceClassNameMap.put( persistentClass.getMappedClass(), persistentClass.getEntityName() );
 			iter = persistentClass.getSubclassIterator();
 			while ( iter.hasNext() ) {
 				final PersistentClass pc = ( PersistentClass ) iter.next();
-				entityNameByInheritenceClassMap.put( pc.getMappedClass(), pc.getEntityName() );
+				entityNameByInheritenceClassNameMap.put( pc.getMappedClass(), pc.getEntityName() );
 			}
 		}
 
@@ -570,13 +570,13 @@ public class EntityMetamodel implements
 	}
 
 	/**
-	 * Return the entity-name mapped to the given class within our inheritance hierarchy, if any.
+	 * Return the entity-name mapped to the given class within our inheritence hierarchy, if any.
 	 *
 	 * @param inheritenceClass The class for which to resolve the entity-name.
 	 * @return The mapped entity-name, or null if no such mapping was found.
 	 */
 	public String findEntityNameByEntityClass(Class inheritenceClass) {
-		return ( String ) entityNameByInheritenceClassMap.get( inheritenceClass );
+		return ( String ) entityNameByInheritenceClassNameMap.get( inheritenceClass.getName() );
 	}
 
 	public String toString() {
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
@@ -1094,10 +1094,6 @@ public class StatefulPersistenceContext
 	public void afterLoad() {
 		loadCounter--;
 	}
-	
-	public boolean isLoadFinished() {
-		return loadCounter == 0;
-	}
 
 	/**
 	 * Returns a string representation of the object.
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java
@@ -111,14 +111,6 @@ public class LoadQueryInfluencers implem
 		return enabledFilters;
 	}
 
-	/**
-	 * Returns an unmodifiable Set of enabled filter names.
-	 * @return an unmodifiable Set of enabled filter names.
-	 */
-	public Set getEnabledFilterNames() {
-		return java.util.Collections.unmodifiableSet( enabledFilters.keySet() );
-	}
-
 	public Filter getEnabledFilter(String filterName) {
 		return ( Filter ) enabledFilters.get( filterName );
 	}
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/PersistenceContext.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/PersistenceContext.java
@@ -445,11 +445,6 @@ public interface PersistenceContext {
 	 * Call this after finishing a two-phase load
 	 */
 	public void afterLoad();
-	
-	/**
-	 * Is in a two-phase load?
-	 */
-	public boolean isLoadFinished();
 
 	/**
 	 * Returns a string representation of the object.
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java
@@ -32,8 +32,8 @@ import org.hibernate.type.Type;
  * @author gloegl
  */
 public class NativeSQLQueryScalarReturn implements NativeSQLQueryReturn {
-	private final Type type;
-	private final String columnAlias;
+	private Type type;
+	private String columnAlias;
 	private final int hashCode;
 
 	public NativeSQLQueryScalarReturn(String alias, Type type) {
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java
@@ -38,8 +38,8 @@ import org.hibernate.LockMode;
  * @author Steve Ebersole
  */
 public class NativeSQLQueryCollectionReturn extends NativeSQLQueryNonScalarReturn {
-	private final String ownerEntityName;
-	private final String ownerProperty;
+	private String ownerEntityName;
+	private String ownerProperty;
 	private final int hashCode;
 
 	/**
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java
@@ -35,8 +35,8 @@ import org.hibernate.LockMode;
  * @author Steve Ebersole
  */
 public class NativeSQLQueryJoinReturn extends NativeSQLQueryNonScalarReturn {
-	private final String ownerAlias;
-	private final String ownerProperty;
+	private String ownerAlias;
+	private String ownerProperty;
 	private final int hashCode;
 	/**
 	 * Construct a return descriptor representing some form of fetch.
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java
@@ -36,7 +36,7 @@ import org.hibernate.LockMode;
  * @author Steve Ebersole
  */
 public class NativeSQLQueryRootReturn extends NativeSQLQueryNonScalarReturn {
-	private final String returnEntityName;
+	private String returnEntityName;
 	private final int hashCode;
 
 	/**
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * 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 Inc.
+ * 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
@@ -20,6 +20,7 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
+ *
  */
 package org.hibernate.dialect;
 
@@ -31,11 +32,10 @@ import org.hibernate.Hibernate;
 import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
 import org.hibernate.JDBCException;
+import org.hibernate.dialect.function.AvgWithArgumentCastFunction;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.persister.entity.Lockable;
 import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.function.AvgWithArgumentCastFunction;
-import org.hibernate.dialect.function.SQLFunctionTemplate;
 import org.hibernate.dialect.function.NoArgSQLFunction;
 import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.dialect.function.VarArgsSQLFunction;
@@ -43,55 +43,29 @@ import org.hibernate.dialect.lock.*;
 import org.hibernate.exception.JDBCExceptionHelper;
 import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter;
 import org.hibernate.exception.ViolatedConstraintNameExtracter;
-import org.hibernate.util.ReflectHelper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * An SQL dialect compatible with HSQLDB (HyperSQL).
+ * An SQL dialect compatible with HSQLDB (Hypersonic SQL).
  * <p/>
  * Note this version supports HSQLDB version 1.8 and higher, only.
- * <p/>
- * Enhancements to version 3.5.0 GA to provide basic support for both HSQLDB 1.8.x and 2.0
- * Should work with Hibernate 3.2 and later
  *
  * @author Christoph Sturm
  * @author Phillip Baird
- * @author Fred Toussi
  */
 public class HSQLDialect extends Dialect {
 
-
 	private static final Logger log = LoggerFactory.getLogger( HSQLDialect.class );
 
-	/**
-	 * version is 18 for 1.8 or 20 for 2.0
-	 */
-	private int hsqldbVersion = 18;
-
-
 	public HSQLDialect() {
 		super();
-
-		try {
-			Class props = ReflectHelper.classForName( "org.hsqldb.persist.HsqlDatabaseProperties" );
-			String versionString = (String) props.getDeclaredField( "THIS_VERSION" ).get( null );
-
-			hsqldbVersion = Integer.parseInt( versionString.substring( 0, 1 ) ) * 10;
-			hsqldbVersion += Integer.parseInt( versionString.substring( 2, 3 ) );
-		}
-		catch ( Throwable e ) {
-			// must be a very old version
-		}
-
 		registerColumnType( Types.BIGINT, "bigint" );
 		registerColumnType( Types.BINARY, "binary" );
 		registerColumnType( Types.BIT, "bit" );
-		registerColumnType( Types.CHAR, "char($l)" );
+		registerColumnType( Types.CHAR, "char(1)" );
 		registerColumnType( Types.DATE, "date" );
-
-		registerColumnType( Types.DECIMAL, "decimal($p,$s)" );
+		registerColumnType( Types.DECIMAL, "decimal" );
 		registerColumnType( Types.DOUBLE, "double" );
 		registerColumnType( Types.FLOAT, "float" );
 		registerColumnType( Types.INTEGER, "integer" );
@@ -103,23 +77,12 @@ public class HSQLDialect extends Dialect
 		registerColumnType( Types.TIMESTAMP, "timestamp" );
 		registerColumnType( Types.VARCHAR, "varchar($l)" );
 		registerColumnType( Types.VARBINARY, "varbinary($l)" );
-
-		if ( hsqldbVersion < 20 ) {
-			registerColumnType( Types.NUMERIC, "numeric" );
-		}
-		else {
-			registerColumnType( Types.NUMERIC, "numeric($p,$s)" );
-		}
-
+		registerColumnType( Types.NUMERIC, "numeric" );
 		//HSQL has no Blob/Clob support .... but just put these here for now!
-		if ( hsqldbVersion < 20 ) {
-			registerColumnType( Types.BLOB, "longvarbinary" );
-			registerColumnType( Types.CLOB, "longvarchar" );
-		}
-		else {
-			registerColumnType( Types.BLOB, "blob" );
-			registerColumnType( Types.CLOB, "clob" );
-		}
+		registerColumnType( Types.BLOB, "longvarbinary" );
+		registerColumnType( Types.CLOB, "longvarchar" );
+		registerColumnType( Types.LONGVARBINARY, "longvarbinary" );
+		registerColumnType( Types.LONGVARCHAR, "longvarchar" );
 
 		registerFunction( "avg", new AvgWithArgumentCastFunction( "double" ) );
 
@@ -136,16 +99,13 @@ public class HSQLDialect extends Dialect
 		registerFunction( "space", new StandardSQLFunction( "space", Hibernate.STRING ) );
 		registerFunction( "rawtohex", new StandardSQLFunction( "rawtohex" ) );
 		registerFunction( "hextoraw", new StandardSQLFunction( "hextoraw" ) );
-		registerFunction( "str", new SQLFunctionTemplate( Hibernate.STRING, "cast(?1 as varchar(24))" ) );
+
 		registerFunction( "user", new NoArgSQLFunction( "user", Hibernate.STRING ) );
 		registerFunction( "database", new NoArgSQLFunction( "database", Hibernate.STRING ) );
 
-		registerFunction( "sysdate", new NoArgSQLFunction( "sysdate", Hibernate.DATE, false ) );
 		registerFunction( "current_date", new NoArgSQLFunction( "current_date", Hibernate.DATE, false ) );
 		registerFunction( "curdate", new NoArgSQLFunction( "curdate", Hibernate.DATE ) );
-		registerFunction(
-				"current_timestamp", new NoArgSQLFunction( "current_timestamp", Hibernate.TIMESTAMP, false )
-		);
+		registerFunction( "current_timestamp", new NoArgSQLFunction( "current_timestamp", Hibernate.TIMESTAMP, false ) );
 		registerFunction( "now", new NoArgSQLFunction( "now", Hibernate.TIMESTAMP ) );
 		registerFunction( "current_time", new NoArgSQLFunction( "current_time", Hibernate.TIME, false ) );
 		registerFunction( "curtime", new NoArgSQLFunction( "curtime", Hibernate.TIME ) );
@@ -156,7 +116,7 @@ public class HSQLDialect extends Dialect
 		registerFunction( "month", new StandardSQLFunction( "month", Hibernate.INTEGER ) );
 		registerFunction( "year", new StandardSQLFunction( "year", Hibernate.INTEGER ) );
 		registerFunction( "week", new StandardSQLFunction( "week", Hibernate.INTEGER ) );
-		registerFunction( "quarter", new StandardSQLFunction( "quarter", Hibernate.INTEGER ) );
+		registerFunction( "quater", new StandardSQLFunction( "quater", Hibernate.INTEGER ) );
 		registerFunction( "hour", new StandardSQLFunction( "hour", Hibernate.INTEGER ) );
 		registerFunction( "minute", new StandardSQLFunction( "minute", Hibernate.INTEGER ) );
 		registerFunction( "second", new StandardSQLFunction( "second", Hibernate.INTEGER ) );
@@ -213,7 +173,7 @@ public class HSQLDialect extends Dialect
 	}
 
 	public String getIdentityInsertString() {
-		return hsqldbVersion < 20 ? "null" : "default";
+		return "null";
 	}
 
 	public boolean supportsLockTimeouts() {
@@ -233,25 +193,14 @@ public class HSQLDialect extends Dialect
 	}
 
 	public String getLimitString(String sql, boolean hasOffset) {
-		if ( hsqldbVersion < 20 ) {
-			return new StringBuffer( sql.length() + 10 )
-					.append( sql )
-					.insert(
-							sql.toLowerCase().indexOf( "select" ) + 6,
-							hasOffset ? " limit ? ?" : " top ?"
-					)
-					.toString();
-		}
-		else {
-			return new StringBuffer( sql.length() + 20 )
-					.append( sql )
-					.append( hasOffset ? " offset ? limit ?" : " limit ?" )
-					.toString();
-		}
+		return new StringBuffer( sql.length() + 10 )
+				.append( sql )
+				.insert( sql.toLowerCase().indexOf( "select" ) + 6, hasOffset ? " limit ? ?" : " top ?" )
+				.toString();
 	}
 
 	public boolean bindLimitParametersFirst() {
-		return hsqldbVersion < 20;
+		return true;
 	}
 
 	public boolean supportsIfExistsAfterTableName() {
@@ -259,7 +208,7 @@ public class HSQLDialect extends Dialect
 	}
 
 	public boolean supportsColumnCheck() {
-		return hsqldbVersion >= 20;
+		return false;
 	}
 
 	public boolean supportsSequences() {
@@ -292,10 +241,10 @@ public class HSQLDialect extends Dialect
 	}
 
 	public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-		return hsqldbVersion < 20 ? EXTRACTER_18 : EXTRACTER_20;
+		return EXTRACTER;
 	}
 
-	private static ViolatedConstraintNameExtracter EXTRACTER_18 = new TemplatedViolatedConstraintNameExtracter() {
+	private static ViolatedConstraintNameExtracter EXTRACTER = new TemplatedViolatedConstraintNameExtracter() {
 
 		/**
 		 * Extract the name of the violated constraint from the given SQLException.
@@ -325,260 +274,40 @@ public class HSQLDialect extends Dialect
 			}
 			else if ( errorCode == -177 ) {
 				constraintName = extractUsingTemplate(
-						"Integrity constraint violation - no parent ", " table:",
-						sqle.getMessage()
+						"Integrity constraint violation - no parent ", " table:", sqle.getMessage()
 				);
 			}
-			return constraintName;
-		}
 
-	};
-
-	/**
-	 * HSQLDB 2.0 messages have changed
-	 * messages may be localized - therefore use the common, non-locale element " table: "
-	 */
-	private static ViolatedConstraintNameExtracter EXTRACTER_20 = new TemplatedViolatedConstraintNameExtracter() {
-
-		public String extractConstraintName(SQLException sqle) {
-			String constraintName = null;
-
-			int errorCode = JDBCExceptionHelper.extractErrorCode( sqle );
-
-			if ( errorCode == -8 ) {
-				constraintName = extractUsingTemplate(
-						"; ", " table: ", sqle.getMessage()
-				);
-			}
-			else if ( errorCode == -9 ) {
-				constraintName = extractUsingTemplate(
-						"; ", " table: ", sqle.getMessage()
-				);
-			}
-			else if ( errorCode == -104 ) {
-				constraintName = extractUsingTemplate(
-						"; ", " table: ", sqle.getMessage()
-				);
-			}
-			else if ( errorCode == -177 ) {
-				constraintName = extractUsingTemplate(
-						"; ", " table: ", sqle.getMessage()
-				);
-			}
 			return constraintName;
 		}
-	};
-
-	public String getSelectClauseNullString(int sqlType) {
-		String literal;
-		switch ( sqlType ) {
-			case Types.VARCHAR:
-			case Types.CHAR:
-				literal = "cast(null as varchar(100))";
-				break;
-			case Types.DATE:
-				literal = "cast(null as date)";
-				break;
-			case Types.TIMESTAMP:
-				literal = "cast(null as timestamp)";
-				break;
-			case Types.TIME:
-				literal = "cast(null as time)";
-				break;
-			default:
-				literal = "cast(null as int)";
-		}
-		return literal;
-	}
 
-
-	// temporary table support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Hibernate uses this information for temporary tables that it uses for its own operations
-	// therefore the appropriate strategy is taken with different versions of HSQLDB
-
-	// All versions of HSQLDB support GLOBAL TEMPORARY tables where the table
-	// definition is shared by all users but data is private to the session
-	// HSQLDB 2.0 also supports session-based LOCAL TEMPORARY tables where
-	// the definition and data is private to the session and table declaration
-	// can happen in the middle of a transaction
+	};
 
 	/**
-	 * Does this dialect support temporary tables?
-	 *
-	 * @return True if temp tables are supported; false otherwise.
+	 * HSQL does not really support temp tables; just take advantage of the
+	 * fact that it is a single user db...
 	 */
 	public boolean supportsTemporaryTables() {
 		return true;
 	}
 
-	/**
-	 * With HSQLDB 2.0, the table name is qualified with MODULE to assist the drop
-	 * statement (in-case there is a global name beginning with HT_)
-	 *
-	 * @param baseTableName The table name from which to base the temp table name.
-	 *
-	 * @return The generated temp table name.
-	 */
-	public String generateTemporaryTableName(String baseTableName) {
-		if ( hsqldbVersion < 20 ) {
-			return "HT_" + baseTableName;
-		}
-		else {
-			return "MODULE.HT_" + baseTableName;
-		}
-	}
-
-	/**
-	 * Command used to create a temporary table.
-	 *
-	 * @return The command used to create a temporary table.
-	 */
-	public String getCreateTemporaryTableString() {
-		if ( hsqldbVersion < 20 ) {
-			return "create global temporary table";
-		}
-		else {
-			return "declare local temporary table";
-		}
-	}
-
-	/**
-	 * No fragment is needed if data is not needed beyond commit, otherwise
-	 * should add "on commit preserve rows"
-	 *
-	 * @return Any required postfix.
-	 */
-	public String getCreateTemporaryTablePostfix() {
-		return "";
-	}
-
-	/**
-	 * Command used to drop a temporary table.
-	 *
-	 * @return The command used to drop a temporary table.
-	 */
-	public String getDropTemporaryTableString() {
-		return "drop table";
-	}
-
-	/**
-	 * Different behaviour for GLOBAL TEMPORARY (1.8) and LOCAL TEMPORARY (2.0)
-	 * <p/>
-	 * Possible return values and their meanings:<ul>
-	 * <li>{@link Boolean#TRUE} - Unequivocally, perform the temporary table DDL
-	 * in isolation.</li>
-	 * <li>{@link Boolean#FALSE} - Unequivocally, do <b>not</b> perform the
-	 * temporary table DDL in isolation.</li>
-	 * <li><i>null</i> - defer to the JDBC driver response in regards to
-	 * {@link java.sql.DatabaseMetaData#dataDefinitionCausesTransactionCommit()}</li>
-	 * </ul>
-	 *
-	 * @return see the result matrix above.
-	 */
-	public Boolean performTemporaryTableDDLInIsolation() {
-		if ( hsqldbVersion < 20 ) {
-			return Boolean.TRUE;
-		}
-		else {
-			return Boolean.FALSE;
-		}
-	}
-
-	/**
-	 * Do we need to drop the temporary table after use?
-	 *
-	 * todo - clarify usage by Hibernate
-	 * Version 1.8 GLOBAL TEMPORARY table definitions persist beyond the end
-	 * of the session (data is cleared). If there are not too many such tables,
-	 * perhaps we can avoid dropping them and reuse the table next time?
-	 *
-	 * @return True if the table should be dropped.
-	 */
-	public boolean dropTemporaryTableAfterUse() {
-		return true;
-	}
-
-	// current timestamp support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-	/**
-	 * HSQLDB 1.8.x requires CALL CURRENT_TIMESTAMP but this should not
-	 * be treated as a callable statement. It is equivalent to
-	 * "select current_timestamp from dual" in some databases.
-	 * HSQLDB 2.0 also supports VALUES CURRENT_TIMESTAMP
-	 *
-	 * @return True if the current timestamp can be retrieved; false otherwise.
-	 */
 	public boolean supportsCurrentTimestampSelection() {
-		return true;
-	}
-
-	/**
-	 * Should the value returned by {@link #getCurrentTimestampSelectString}
-	 * be treated as callable.  Typically this indicates that JDBC escape
-	 * syntax is being used...
-	 *
-	 * @return True if the {@link #getCurrentTimestampSelectString} return
-	 *         is callable; false otherwise.
-	 */
-	public boolean isCurrentTimestampSelectStringCallable() {
 		return false;
 	}
 
-	/**
-	 * Retrieve the command used to retrieve the current timestamp from the
-	 * database.
-	 *
-	 * @return The command.
-	 */
-	public String getCurrentTimestampSelectString() {
-		return "call current_timestamp";
-	}
-
-	/**
-	 * The name of the database-specific SQL function for retrieving the
-	 * current timestamp.
-	 *
-	 * @return The function name.
-	 */
-	public String getCurrentTimestampSQLFunctionName() {
-		// the standard SQL function name is current_timestamp...
-		return "current_timestamp";
-	}
-
-	/**
-	 * For HSQLDB 2.0, this is a copy of the base class implementation.
-	 * For HSQLDB 1.8, only READ_UNCOMMITTED is supported.
-	 *
-	 * @param lockable The persister for the entity to be locked.
-	 * @param lockMode The type of lock to be acquired.
-	 *
-	 * @return The appropriate locking strategy.
-	 *
-	 * @since 3.2
-	 */
 	public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) {
-		if ( lockMode == LockMode.PESSIMISTIC_FORCE_INCREMENT ) {
-			return new PessimisticForceIncrementLockingStrategy( lockable, lockMode );
-		}
-		else if ( lockMode == LockMode.PESSIMISTIC_WRITE ) {
-			return new PessimisticWriteSelectLockingStrategy( lockable, lockMode );
-		}
-		else if ( lockMode == LockMode.PESSIMISTIC_READ ) {
-			return new PessimisticReadSelectLockingStrategy( lockable, lockMode );
-		}
-		else if ( lockMode == LockMode.OPTIMISTIC ) {
-			return new OptimisticLockingStrategy( lockable, lockMode );
+		// HSQLDB only supports READ_UNCOMMITTED transaction isolation
+		if ( lockMode==LockMode.PESSIMISTIC_FORCE_INCREMENT) {
+			return new PessimisticForceIncrementLockingStrategy( lockable, lockMode);
 		}
-		else if ( lockMode == LockMode.OPTIMISTIC_FORCE_INCREMENT ) {
-			return new OptimisticForceIncrementLockingStrategy( lockable, lockMode );
+		else if ( lockMode==LockMode.OPTIMISTIC) {
+			return new OptimisticLockingStrategy( lockable, lockMode);
 		}
-
-		if ( hsqldbVersion < 20 ) {
-			return new ReadUncommittedLockingStrategy( lockable, lockMode );
-		}
-		else {
-			return new SelectLockingStrategy( lockable, lockMode );
+		else if ( lockMode==LockMode.OPTIMISTIC_FORCE_INCREMENT) {
+			return new OptimisticForceIncrementLockingStrategy( lockable, lockMode);
 		}
+		return new ReadUncommittedLockingStrategy( lockable, lockMode );
+		
 	}
 
 	public static class ReadUncommittedLockingStrategy extends SelectLockingStrategy {
@@ -595,9 +324,6 @@ public class HSQLDialect extends Dialect
 		}
 	}
 
-	public boolean supportsCommentOn() {
-		return true;
-	}
 
 	// Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -605,51 +331,7 @@ public class HSQLDialect extends Dialect
 		return false;
 	}
 
-	/**
-	 * todo - needs usage clarification
-	 *
-	 * If the SELECT statement is always part of a UNION, then the type of
-	 * parameter is resolved by v. 2.0, but not v. 1.8 (assuming the other
-	 * SELECT in the UNION has a column reference in the same position and
-	 * can be type-resolved).
-	 *
-	 * On the other hand if the SELECT statement is isolated, all versions of
-	 * HSQLDB require casting for "select ? from .." to work.
-	 *
-	 * @return True if select clause parameter must be cast()ed
-	 *
-	 * @since 3.2
-	 */
-	public boolean requiresCastingOfParametersInSelectClause() {
-		return true;
-	}
-
-	/**
-	 * For the underlying database, is READ_COMMITTED isolation implemented by
-	 * forcing readers to wait for write locks to be released?
-	 *
-	 * @return True if writers block readers to achieve READ_COMMITTED; false otherwise.
-	 */
-	public boolean doesReadCommittedCauseWritersToBlockReaders() {
-		return hsqldbVersion >= 20;
-	}
-
-	/**
-	 * For the underlying database, is REPEATABLE_READ isolation implemented by
-	 * forcing writers to wait for read locks to be released?
-	 *
-	 * @return True if readers block writers to achieve REPEATABLE_READ; false otherwise.
-	 */
-	public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-		return hsqldbVersion >= 20;
-	}
-
-
 	public boolean supportsLobValueChangePropogation() {
 		return false;
 	}
-
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -164,8 +164,4 @@ public class SQLServerDialect extends Ab
 	public boolean doesRepeatableReadCauseReadersToBlockWriters() {
 		return false; // here assume SQLServer2005 using snapshot isolation, which does not have this problem
 	}
-
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/H2Dialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/H2Dialect.java
@@ -309,8 +309,4 @@ public class H2Dialect extends Dialect {
 	public boolean supportsLobValueChangePropogation() {
 		return false;
 	}
-
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java
@@ -131,12 +131,8 @@ public class Oracle9iDialect extends Ora
 	 * HHH-4907, I don't know if oracle 8 supports this syntax, so I'd think it is better add this 
 	 * method here. Reopen this issue if you found/know 8 supports it.
 	 */
-	public boolean supportsRowValueConstructorSyntaxInInList() {
-		return true;
-	}
-
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}	
+    public boolean supportsRowValueConstructorSyntaxInInList() {
+        return true;
+    }
 	
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -290,10 +290,6 @@ public class PostgreSQLDialect extends D
 		return "select now()";
 	}
 
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}
-
 	public String toBooleanValueString(boolean bool) {
 		return bool ? "true" : "false";
 	}
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java
@@ -1,7 +1,6 @@
 package org.hibernate.dialect;
 
 import java.sql.Types;
-import java.util.Properties;
 
 import org.hibernate.Hibernate;
 import org.hibernate.cfg.Environment;
@@ -9,10 +8,9 @@ import org.hibernate.dialect.function.No
 
 /**
  * A SQL dialect for Ingres 10 and later versions.
- * <p/>
+ *
  * Changes:
  * <ul>
- * <li>Add native BOOLEAN type support</li>
  * </ul>
  *
  * @author Raymond Fan
@@ -20,39 +18,5 @@ import org.hibernate.dialect.function.No
 public class Ingres10Dialect extends Ingres9Dialect {
     public Ingres10Dialect() {
         super();
-        registerBooleanSupport();
-    }
-
-    // Boolean column type support
-
-    /**
-     * The SQL literal value to which this database maps boolean values.
-     *
-     * @param bool The boolean value
-     * @return The appropriate SQL literal.
-     */
-    public String toBooleanValueString(boolean bool) {
-        return bool ? "true" : "false";
-    }
-
-    protected void registerBooleanSupport() {
-        // Column type
-
-        // Boolean type (mapping/BooleanType) mapping maps SQL BIT to Java
-        // Boolean. In order to create a boolean column, BIT needs to be mapped
-        // to boolean as well, similar to H2Dialect.
-        registerColumnType( Types.BIT, "boolean" );
-        registerColumnType( Types.BOOLEAN, "boolean" );
-
-        // Functions
-
-        // true, false and unknown are now valid values
-        // Remove the query substitutions previously added in IngresDialect.
-        Properties properties = getDefaultProperties();
-        String querySubst = properties.getProperty(Environment.QUERY_SUBSTITUTIONS);
-        if (querySubst != null) {
-            String newQuerySubst = querySubst.replace("true=1,false=0","");
-            properties.setProperty(Environment.QUERY_SUBSTITUTIONS, newQuerySubst);
-        }
     }
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/Dialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -1999,23 +1999,4 @@ public abstract class Dialect {
 	public boolean supportsBindAsCallableArgument() {
 		return true;
 	}
-
-	/**
-	 * Does this dialect support `count(a,b)`?
-	 *
-	 * @return True if the database supports counting tuples; false otherwise.
-	 */
-	public boolean supportsTupleCounts() {
-		return false;
-	}
-
-	/**
-	 * Does this dialect support `count(distinct a,b)`?
-	 *
-	 * @return True if the database supports counting disintct tuples; false otherwise.
-	 */
-	public boolean supportsTupleDistinctCounts() {
-		// oddly most database in fact seem to, so true is the default.
-		return true;
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -432,8 +432,4 @@ public class DB2Dialect extends Dialect
 	public boolean doesReadCommittedCauseWritersToBlockReaders() {
 		return true;
 	}
-
-	public boolean supportsTupleDistinctCounts() {
-		return false;
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
@@ -328,7 +328,7 @@ public class CustomLoader extends Loader
 	}
 	
 	static private HolderInstantiator getHolderInstantiator(ResultTransformer resultTransformer, String[] queryReturnAliases) {
-		if ( resultTransformer == null ) {
+		if ( resultTransformer != null ) {
 			return HolderInstantiator.NOOP_INSTANTIATOR;
 		}
 		else {
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java
@@ -36,17 +36,14 @@ import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.LazyInitializationException;
 import org.hibernate.engine.CollectionEntry;
-import org.hibernate.engine.EntityEntry;
 import org.hibernate.engine.ForeignKeys;
 import org.hibernate.engine.SessionImplementor;
-import org.hibernate.engine.Status;
 import org.hibernate.engine.TypedValue;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
 import org.hibernate.util.CollectionHelper;
 import org.hibernate.util.EmptyIterator;
-import org.hibernate.util.IdentitySet;
 import org.hibernate.util.MarkerObject;
 
 /**
@@ -908,29 +905,20 @@ public abstract class AbstractPersistent
 
 		// collect EntityIdentifier(s) of the *current* elements - add them into a HashSet for fast access
 		java.util.Set currentIds = new HashSet();
-		java.util.Set currentSaving = new IdentitySet();
 		for ( Iterator it=currentElements.iterator(); it.hasNext(); ) {
 			Object current = it.next();
 			if ( current!=null && ForeignKeys.isNotTransient(entityName, current, null, session) ) {
-				EntityEntry ee = session.getPersistenceContext().getEntry( current );
-				if ( ee != null && ee.getStatus() == Status.SAVING ) {
-					currentSaving.add( current );
-				}
-				else {
-					Serializable currentId = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, current, session);
-					currentIds.add( new TypedValue( idType, currentId, session.getEntityMode() ) );
-				}
+				Serializable currentId = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, current, session);
+				currentIds.add( new TypedValue( idType, currentId, session.getEntityMode() ) );
 			}
 		}
 
 		// iterate over the *old* list
 		for ( Iterator it=oldElements.iterator(); it.hasNext(); ) {
 			Object old = it.next();
-			if ( ! currentSaving.contains( old ) ) {
-				Serializable oldId = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, old, session);
-				if ( !currentIds.contains( new TypedValue( idType, oldId, session.getEntityMode() ) ) ) {
-					res.add(old);
-				}
+			Serializable oldId = ForeignKeys.getEntityIdentifierIfNotUnsaved(entityName, old, session);
+			if ( !currentIds.contains( new TypedValue( idType, oldId, session.getEntityMode() ) ) ) {
+				res.add(old);
 			}
 		}
 
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/impl/SessionImpl.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/impl/SessionImpl.java
@@ -2141,14 +2141,9 @@ public final class SessionImpl extends A
 
 		childSessionsByEntityMode = ( Map ) ois.readObject();
 
-		// LoadQueryInfluencers.getEnabledFilters() tries to validate each enabled
-		// filter, which will fail when called before FilterImpl.afterDeserialize( factory );
-		// Instead lookup the filter by name and then call FilterImpl.afterDeserialize( factory ).
-		Iterator iter = loadQueryInfluencers.getEnabledFilterNames().iterator();
+		Iterator iter = loadQueryInfluencers.getEnabledFilters().values().iterator();
 		while ( iter.hasNext() ) {
-			String filterName = ( String ) iter.next();
-			 ( ( FilterImpl ) loadQueryInfluencers.getEnabledFilter( filterName )  )
-					.afterDeserialize( factory );
+			( ( FilterImpl ) iter.next() ).afterDeserialize( factory );
 		}
 
 		if ( isRootSession && childSessionsByEntityMode != null ) {
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/impl/FilterImpl.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/impl/FilterImpl.java
@@ -51,7 +51,6 @@ public class FilterImpl implements Filte
 	
 	void afterDeserialize(SessionFactoryImpl factory) {
 		definition = factory.getFilterDefinition(filterName);
-		validate();
 	}
 
 	/**
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java
@@ -179,9 +179,7 @@ public class StatelessSessionImpl extend
 		errorIfClosed();
 		Object result = getFactory().getEntityPersister(entityName)
 				.load(id, null, lockMode, this);
-		if (temporaryPersistenceContext.isLoadFinished()) {
-			temporaryPersistenceContext.clear();
-		}
+		temporaryPersistenceContext.clear();
 		return result;
 	}
 
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
@@ -204,8 +204,6 @@ public final class SessionFactoryImpl im
 			Constructor constructor = concurrentStatsClass.getConstructor(new Class[]{SessionFactoryImplementor.class});
 			concurrentStatistics = (Statistics) constructor.newInstance(new Object[]{this});
 			log.trace("JDK 1.5 concurrent classes present");
-		} catch ( NoClassDefFoundError noJava5 ) {
-			log.trace("JDK 1.5 concurrent classes missing");
 		} catch (Exception noJava5) {
 			log.trace("JDK 1.5 concurrent classes missing");
 		}
--- libhibernate3-java-3.5.4.Final.orig/core/src/main/java/org/hibernate/cfg/Configuration.java
+++ libhibernate3-java-3.5.4.Final/core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -2718,15 +2718,12 @@ public class Configuration implements Se
 					finalName = ( String ) binding.logicalToPhysical.get( logicalName );
 				}
 				String key = buildTableNameKey(
-						currentTable.getQuotedSchema(), currentTable.getCatalog(), currentTable.getQuotedName()
+						currentTable.getSchema(), currentTable.getCatalog(), currentTable.getName()
 				);
 				TableDescription description = ( TableDescription ) tableNameBinding.get( key );
 				if ( description != null ) {
 					currentTable = description.denormalizedSupertable;
 				}
-				else {
-					currentTable = null;
-				}
 			} while ( finalName == null && currentTable != null );
 
 			if ( finalName == null ) {
@@ -2747,15 +2744,12 @@ public class Configuration implements Se
 					logical = ( String ) binding.physicalToLogical.get( physicalName );
 				}
 				String key = buildTableNameKey(
-						currentTable.getQuotedSchema(), currentTable.getCatalog(), currentTable.getQuotedName()
+						currentTable.getSchema(), currentTable.getCatalog(), currentTable.getName()
 				);
 				description = ( TableDescription ) tableNameBinding.get( key );
 				if ( description != null ) {
 					currentTable = description.denormalizedSupertable;
 				}
-				else {
-					currentTable = null;
-				}
 			}
 			while ( logical == null && currentTable != null && description != null );
 			if ( logical == null ) {
--- libhibernate3-java-3.5.4.Final.orig/cache-swarmcache/pom.xml
+++ libhibernate3-java-3.5.4.Final/cache-swarmcache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/jdbc3-testing/pom.xml
+++ libhibernate3-java-3.5.4.Final/jdbc3-testing/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/jmx/pom.xml
+++ libhibernate3-java-3.5.4.Final/jmx/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/connection-proxool/pom.xml
+++ libhibernate3-java-3.5.4.Final/connection-proxool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/cache-infinispan/pom.xml
+++ libhibernate3-java-3.5.4.Final/cache-infinispan/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
+++ libhibernate3-java-3.5.4.Final/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
@@ -415,32 +415,6 @@ public class InfinispanRegionFactoryTest
       }
    }
 
-   public void testBuildQueryRegionWithCustomRegionName() {
-      final String queryRegionName = "myquery";
-      Properties p = new Properties();
-      InfinispanRegionFactory factory = new InfinispanRegionFactory();
-      p.setProperty("hibernate.cache.infinispan.myquery.cfg", "timestamps-none-eviction");
-      p.setProperty("hibernate.cache.infinispan.myquery.eviction.strategy", "FIFO");
-      p.setProperty("hibernate.cache.infinispan.myquery.eviction.wake_up_interval", "2222");
-      p.setProperty("hibernate.cache.infinispan.myquery.eviction.max_entries", "11111");
-      factory.start(null, p);
-      CacheManager manager = factory.getCacheManager();
-      manager.getGlobalConfiguration().setTransportClass(null);
-      try {
-         assertTrue(factory.getDefinedConfigurations().contains("local-query"));
-         QueryResultsRegionImpl region = (QueryResultsRegionImpl) factory.buildQueryResultsRegion(queryRegionName, p);
-         assertNotNull(factory.getTypeOverrides().get(queryRegionName));
-         assertTrue(factory.getDefinedConfigurations().contains(queryRegionName));
-         CacheAdapter cache = region.getCacheAdapter();
-         Configuration cacheCfg = cache.getConfiguration();
-         assertEquals(EvictionStrategy.FIFO, cacheCfg.getEvictionStrategy());
-         assertEquals(2222, cacheCfg.getEvictionWakeUpInterval());
-         assertEquals(11111, cacheCfg.getEvictionMaxEntries());
-      } finally {
-         factory.stop();
-      }
-   }
-
    public void testEnableStatistics() {
       Properties p = new Properties();
       p.setProperty("hibernate.cache.infinispan.statistics", "true");
--- libhibernate3-java-3.5.4.Final.orig/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
+++ libhibernate3-java-3.5.4.Final/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
@@ -88,7 +88,6 @@ public class IsolatedClassLoaderTest ext
    protected void standardConfigure(Configuration cfg) {
       super.standardConfigure(cfg);
       cfg.setProperty(InfinispanRegionFactory.QUERY_CACHE_RESOURCE_PROP, "replicated-query");
-      cfg.setProperty("hibernate.cache.infinispan.AccountRegion.cfg", "replicated-query");
    }
 
 
@@ -165,25 +164,15 @@ public class IsolatedClassLoaderTest ext
       // Bind a listener to the "local" cache
       // Our region factory makes its CacheManager available to us
       CacheManager localManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.LOCAL);
-      // Bind a listener to the "remote" cache
-      CacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
-      String cacheName;
-      if (useNamedRegion) {
-         cacheName = "AccountRegion"; // As defined by ClassLoaderTestDAO via calls to query.setCacheRegion
-         // Define cache configurations for region early to avoid ending up with local caches for this region
-         localManager.defineConfiguration(cacheName, "replicated-query", new org.infinispan.config.Configuration());
-         remoteManager.defineConfiguration(cacheName, "replicated-query", new org.infinispan.config.Configuration());
-      } else {
-         cacheName = "replicated-query";
-      }
-
-      localQueryCache = localManager.getCache(cacheName);
+      localQueryCache = localManager.getCache("replicated-query");
       localQueryListener = new CacheAccessListener();
       localQueryCache.addListener(localQueryListener);
 
       TransactionManager localTM = DualNodeJtaTransactionManagerImpl.getInstance(DualNodeTestCase.LOCAL);
 
-      remoteQueryCache = remoteManager.getCache(cacheName);
+      // Bind a listener to the "remote" cache
+      CacheManager remoteManager = ClusterAwareRegionFactory.getCacheManager(DualNodeTestCase.REMOTE);
+      remoteQueryCache = remoteManager.getCache("replicated-query");
       remoteQueryListener = new CacheAccessListener();
       remoteQueryCache.addListener(remoteQueryListener);
 
--- libhibernate3-java-3.5.4.Final.orig/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
+++ libhibernate3-java-3.5.4.Final/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
@@ -51,15 +51,7 @@ public class JndiInfinispanRegionFactory
     * There is no default value -- the user must specify the property.
     */
    public static final String CACHE_MANAGER_RESOURCE_PROP = "hibernate.cache.infinispan.cachemanager";
-
-   public JndiInfinispanRegionFactory() {
-      super();
-   }
-
-   public JndiInfinispanRegionFactory(Properties props) {
-      super(props);
-   }
-
+   
    @Override
    protected CacheManager createCacheManager(Properties properties) throws CacheException {
       String name = PropertiesHelper.getString(CACHE_MANAGER_RESOURCE_PROP, properties, null);
--- libhibernate3-java-3.5.4.Final.orig/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
+++ libhibernate3-java-3.5.4.Final/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
@@ -99,7 +99,7 @@ public class InfinispanRegionFactory imp
    /**
     * Name of the configuration that should be used for timestamp caches.
     * 
-    * @see #DEF_TIMESTAMPS_RESOURCE
+    * @see #DEF_TS_RESOURCE
     */
    public static final String TIMESTAMPS_CACHE_RESOURCE_PROP = PREFIX + TIMESTAMPS_KEY + CONFIG_SUFFIX;
 
@@ -113,7 +113,7 @@ public class InfinispanRegionFactory imp
    public static final String QUERY_CACHE_RESOURCE_PROP = PREFIX + QUERY_KEY + CONFIG_SUFFIX;
 
    /**
-    * Default value for {@link #INFINISPAN_CONFIG_RESOURCE_PROP}. Specifies the "infinispan-configs.xml" file in this package.
+    * Default value for {@link #INFINISPAN_RESOURCE_PROP}. Specifies the "infinispan-configs.xml" file in this package.
     */
    public static final String DEF_INFINISPAN_CONFIG_RESOURCE = "org/hibernate/cache/infinispan/builder/infinispan-configs.xml";
 
@@ -159,7 +159,7 @@ public class InfinispanRegionFactory imp
 
    /** {@inheritDoc} */
    public CollectionRegion buildCollectionRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {
-      if (log.isDebugEnabled()) log.debug("Building collection cache region [" + regionName + "]");
+      log.debug("Building collection cache region [" + regionName + "]");
       Cache cache = getCache(regionName, COLLECTION_KEY, properties);
       CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(cache);
       CollectionRegionImpl region = new CollectionRegionImpl(cacheAdapter, regionName, metadata, transactionManager, this);
@@ -182,14 +182,9 @@ public class InfinispanRegionFactory imp
     */
    public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties properties)
             throws CacheException {
-      if (log.isDebugEnabled()) log.debug("Building query results cache region [" + regionName + "]");
+      log.debug("Building query results cache region [" + regionName + "]");
       String cacheName = typeOverrides.get(QUERY_KEY).getCacheName();
-      // If region name is not default one, lookup a cache for that region name
-      if (!regionName.equals("org.hibernate.cache.StandardQueryCache"))
-         cacheName = regionName;
-
-      Cache cache = getCache(cacheName, QUERY_KEY, properties);
-      CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(cache);
+      CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(manager.getCache(cacheName));
       QueryResultsRegionImpl region = new QueryResultsRegionImpl(cacheAdapter, regionName, properties, transactionManager, this);
       region.start();
       return region;
@@ -200,7 +195,7 @@ public class InfinispanRegionFactory imp
     */
    public TimestampsRegion buildTimestampsRegion(String regionName, Properties properties)
             throws CacheException {
-      if (log.isDebugEnabled()) log.debug("Building timestamps cache region [" + regionName + "]");
+      log.debug("Building timestamps cache region [" + regionName + "]");
       String cacheName = typeOverrides.get(TIMESTAMPS_KEY).getCacheName();
       CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(manager.getCache(cacheName));
       TimestampsRegionImpl region = new TimestampsRegionImpl(cacheAdapter, regionName, transactionManager, this);
@@ -374,7 +369,7 @@ public class InfinispanRegionFactory imp
          String templateCacheName = null;
          Configuration regionCacheCfg = null;
          if (regionOverride != null) {
-            if (log.isDebugEnabled()) log.debug("Cache region specific configuration exists: " + regionOverride);
+            if (log.isDebugEnabled()) log.debug("Entity cache region specific configuration exists: " + regionOverride);
             regionOverride = overrideStatisticsIfPresent(regionOverride, properties);
             regionCacheCfg = regionOverride.createInfinispanConfiguration();
             String cacheName = regionOverride.getCacheName();
@@ -417,4 +412,4 @@ public class InfinispanRegionFactory imp
       }
       return override;
    }
-}
+}
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/jdbc4-testing/pom.xml
+++ libhibernate3-java-3.5.4.Final/jdbc4-testing/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/connection-c3p0/pom.xml
+++ libhibernate3-java-3.5.4.Final/connection-c3p0/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/parent/pom.xml
+++ libhibernate3-java-3.5.4.Final/parent/pom.xml
@@ -29,7 +29,7 @@
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.4-Final</version>
+    <version>3.5.2-Final</version>
 
     <name>Hibernate Core Parent POM</name>
     <description>The base POM for all Hibernate Core modules.</description>
@@ -539,11 +539,6 @@
                 <artifactId>hibernate-validator</artifactId>
                 <version>4.0.2.GA</version>
             </dependency>
-            <dependency>
-                <groupId>hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>1.8.0.2</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -574,6 +569,7 @@
                 <dependency>
                     <groupId>hsqldb</groupId>
                     <artifactId>hsqldb</artifactId>
+                    <version>1.8.0.2</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -623,16 +619,16 @@
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                    <version>5.0.8</version>
+                    <version>5.0.5</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
                 <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
                 <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr35</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -644,16 +640,16 @@
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                    <version>5.1.12</version>
+                    <version>5.0.5</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
                 <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
                 <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr35</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -672,10 +668,10 @@
             <properties>
                 <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect>
                 <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
-                <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbr35
+                <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru
                 </jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -687,16 +683,16 @@
                 <dependency>
                     <groupId>postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>8.4-701.jdbc3</version>
+                    <version>8.2-504.jdbc3</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
                 <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
                 <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr35</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -708,16 +704,16 @@
                 <dependency>
                     <groupId>postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>8.4-701.jdbc3</version>
+                    <version>8.2-504.jdbc3</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
             <properties>
                 <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
                 <jdbc.driver>org.postgresql.Driver</jdbc.driver>
-                <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr35</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -748,8 +744,8 @@
                 <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
                 <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
                 <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -774,8 +770,8 @@
                 <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
                 <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
                 <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -787,7 +783,7 @@
                 <dependency>
                     <groupId>com.ibm</groupId>
                     <artifactId>db2jcc</artifactId>
-                    <version>3.58.82</version>
+                    <version>3.57.86</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -800,8 +796,8 @@
                 <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
                 <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
                 <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -822,8 +818,8 @@
                 <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
                 <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -836,7 +832,7 @@
                     <groupId>com.oracle</groupId>
                     <artifactId>ojdbc14</artifactId>
                     <!-- use the 10g drivers which are surprisingly largely bug free -->
-                    <version>10.2.0.4</version>
+                    <version>10.0.2.0</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -844,8 +840,8 @@
                 <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
                 <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -864,10 +860,9 @@
             <properties>
                 <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-                <!-- fall back to oracle 11g r1, once the account be setup, we should change this back   <jdbc.url>jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</jdbc.url> -->
-<jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -886,12 +881,11 @@
             <properties>
                 <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
-<!--        fall back to oracle 11g r1, once the account be setup, we should change this back        <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(LOAD_BALANCE=on)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
-				--><jdbc.url>
-                  jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))
+                <jdbc.url>
+                    jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))
                 </jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -910,9 +904,9 @@
             <properties>
                 <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
                 <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
-                <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbr35?DYNAMIC_PREPARE=true</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation />
             </properties>
         </profile>
@@ -932,8 +926,8 @@
                 <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
                 <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
                 <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation>4096</jdbc.isolation>
             </properties>
         </profile>
@@ -953,8 +947,8 @@
                 <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
                 <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
                 <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
-                <jdbc.user>hibbr35</jdbc.user>
-                <jdbc.pass>hibbr35</jdbc.pass>
+                <jdbc.user>hibbrtru</jdbc.user>
+                <jdbc.pass>hibbrtru</jdbc.pass>
                 <jdbc.isolation>4096</jdbc.isolation>
             </properties>
         </profile>
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/pom.xml
+++ libhibernate3-java-3.5.4.Final/entitymanager/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
@@ -1,3 +1,4 @@
+// $Id: TestCase.java 18931 2010-03-05 22:22:05Z smarlow@redhat.com $
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -35,8 +36,8 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.cfg.Environment;
@@ -52,7 +53,8 @@ import org.hibernate.test.annotations.Hi
  * @author Hardy Ferentschik
  */
 public abstract class TestCase extends HibernateTestCase {
-	private static final Logger log = LoggerFactory.getLogger( TestCase.class );
+
+	private static final Log log = LogFactory.getLog( TestCase.class );
 
 	protected static EntityManagerFactory factory;
 	private EntityManager em;
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java
@@ -38,10 +38,7 @@ import javax.persistence.metamodel.ListA
 import javax.persistence.metamodel.MappedSuperclassType;
 import javax.persistence.metamodel.IdentifiableType;
 
-import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.ejb.metamodel.MetamodelImpl;
 import org.hibernate.ejb.test.TestCase;
-import org.hibernate.engine.SessionFactoryImplementor;
 
 /**
  * @author Emmanuel Bernard
@@ -55,16 +52,6 @@ public class MetadataTest extends TestCa
 		assertNotNull( entityType );
 	}
 
-	@SuppressWarnings({ "unchecked" })
-	public void testBuildingMetamodelWithParameterizedCollection() {
-		AnnotationConfiguration cfg = new AnnotationConfiguration( );
-		configure( cfg );
-		cfg.addAnnotatedClass( WithGenericCollection.class );
-		cfg.buildMappings();
-		SessionFactoryImplementor sfi = (SessionFactoryImplementor) cfg.buildSessionFactory();
-		MetamodelImpl.buildMetamodel( cfg.getClassMappings(), sfi );
-	}
-
 	public void testLogicalManyToOne() throws Exception {
 		final EntityType<JoinedManyToOneOwner> entityType = factory.getMetamodel().entity( JoinedManyToOneOwner.class );
 		final SingularAttribute attr = entityType.getDeclaredSingularAttribute( "house" );
@@ -111,7 +98,7 @@ public class MetadataTest extends TestCa
 		assertNotNull( houseId );
 		assertTrue( houseId.isId() );
 		assertEquals( Attribute.PersistentAttributeType.EMBEDDED, houseId.getPersistentAttributeType() );
-
+		
 		final EntityType<Person> personType = factory.getMetamodel().entity( Person.class );
 		assertFalse( personType.hasSingleIdAttribute() );
 		final Set<SingularAttribute<? super Person,?>> ids = personType.getIdClassAttributes();
@@ -231,7 +218,7 @@ public class MetadataTest extends TestCa
 
 		assertTrue( cat.hasVersionAttribute() );
 		assertEquals( "version", cat.getVersion(Long.class).getName() );
-		verifyDeclaredVersionNotPresent( cat );
+		verifyDeclaredVersiobnNotPresent( cat );
 		verifyDeclaredIdNotPresentAndIdPresent(cat);
 
 		assertEquals( Type.PersistenceType.MAPPED_SUPERCLASS, cat.getSupertype().getPersistenceType() );
@@ -242,7 +229,7 @@ public class MetadataTest extends TestCa
 
 		assertTrue( cattish.hasVersionAttribute() );
 		assertEquals( "version", cattish.getVersion(Long.class).getName() );
-		verifyDeclaredVersionNotPresent( cattish );
+		verifyDeclaredVersiobnNotPresent( cattish );
 		verifyDeclaredIdNotPresentAndIdPresent(cattish);
 
 		assertEquals( Type.PersistenceType.ENTITY, cattish.getSupertype().getPersistenceType() );
@@ -253,7 +240,7 @@ public class MetadataTest extends TestCa
 
 		assertTrue( feline.hasVersionAttribute() );
 		assertEquals( "version", feline.getVersion(Long.class).getName() );
-		verifyDeclaredVersionNotPresent( feline );
+		verifyDeclaredVersiobnNotPresent( feline );
 		verifyDeclaredIdNotPresentAndIdPresent(feline);
 
 		assertEquals( Type.PersistenceType.MAPPED_SUPERCLASS, feline.getSupertype().getPersistenceType() );
@@ -264,7 +251,7 @@ public class MetadataTest extends TestCa
 
 		assertTrue( animal.hasVersionAttribute() );
 		assertEquals( "version", animal.getVersion(Long.class).getName() );
-		verifyDeclaredVersionNotPresent( animal );
+		verifyDeclaredVersiobnNotPresent( animal );
 		assertEquals( "id", animal.getId(Long.class).getName() );
 		final SingularAttribute<Animal, Long> id = animal.getDeclaredId( Long.class );
 		assertEquals( "id", id.getName() );
@@ -331,7 +318,7 @@ public class MetadataTest extends TestCa
 		}
 	}
 
-	private void verifyDeclaredVersionNotPresent(IdentifiableType<?> type) {
+	private void verifyDeclaredVersiobnNotPresent(IdentifiableType<?> type) {
 		try {
 			type.getDeclaredVersion(Long.class);
 			fail("Should not have a declared version");
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java
@@ -8,18 +8,10 @@ import javax.persistence.GeneratedValue;
  * @author Emmanuel Bernard
  */
 @Entity
-public class Book extends CopyrightableContent {
+public class Book {
 	private Long id;
 	private String name;
 
-	public Book() {
-		super();
-	}
-
-	public Book(Author a) {
-		super(a);
-	}
-
 	@Id
 	@GeneratedValue
 	public Long getId() {
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java
@@ -56,8 +56,7 @@ public class GetIdentifierTest extends T
 		return new Class[] {
 				Book.class,
 				Umbrella.class,
-				Sickness.class,
-				Author.class
+				Sickness.class
 		};
 	}
 }
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java
@@ -1,4 +1,4 @@
-// $Id: ScannerTest.java 19666 2010-06-02 14:48:41Z epbernard $
+// $Id: ScannerTest.java 19060 2010-03-22 14:40:05Z epbernard $
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -35,7 +35,6 @@ import javax.persistence.EntityManagerFa
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Persistence;
 
-import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.ejb.packaging.NamedInputStream;
 import org.hibernate.ejb.packaging.NativeScanner;
 import org.hibernate.ejb.packaging.Scanner;
@@ -83,25 +82,13 @@ public class ScannerTest extends Packagi
 		
 		EntityManagerFactory emf;
 		CustomScanner.resetUsed();
-		final HashMap integration = new HashMap();
-		emf = Persistence.createEntityManagerFactory( "defaultpar", integration );
+		emf = Persistence.createEntityManagerFactory( "defaultpar", new HashMap() );
 		assertTrue( ! CustomScanner.isUsed() );
 		emf.close();
 
 		CustomScanner.resetUsed();
-		emf = Persistence.createEntityManagerFactory( "manager1", integration );
+		emf = Persistence.createEntityManagerFactory( "manager1", new HashMap() );
 		assertTrue( CustomScanner.isUsed() );
 		emf.close();
-
-		CustomScanner.resetUsed();
-		integration.put( AvailableSettings.SCANNER, new CustomScanner() );
-		emf = Persistence.createEntityManagerFactory( "defaultpar", integration );
-		assertTrue( CustomScanner.isUsed() );
-		emf.close();
-
-		CustomScanner.resetUsed();
-		emf = Persistence.createEntityManagerFactory( "defaultpar", null );
-		assertTrue( ! CustomScanner.isUsed() );
-		emf.close();
 	}
 }
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
@@ -1,4 +1,4 @@
-//$Id: EntityManagerSerializationTest.java 19602 2010-05-25 13:30:22Z epbernard $
+//$Id: EntityManagerSerializationTest.java 14824 2008-06-29 13:47:11Z hardy.ferentschik $
 package org.hibernate.ejb.test.ejb3configuration;
 
 import java.io.ByteArrayInputStream;
@@ -32,10 +32,10 @@ public class EntityManagerSerializationT
 		stream.close();
 		ByteArrayInputStream byteIn = new ByteArrayInputStream( serialized );
 		ObjectInputStream in = new ObjectInputStream( byteIn );
-		EntityManagerFactory serializedFactory = (EntityManagerFactory) in.readObject();
+		EntityManagerFactory seriallizedFactory = (EntityManagerFactory) in.readObject();
 		in.close();
 		byteIn.close();
-		EntityManager em = serializedFactory.createEntityManager();
+		EntityManager em = seriallizedFactory.createEntityManager();
 		//em.getTransaction().begin();
 		//em.setFlushMode( FlushModeType.NEVER );
 		Cat cat = new Cat();
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
@@ -25,7 +25,6 @@ package org.hibernate.ejb.criteria.basic
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Collections;
 import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -59,7 +58,7 @@ public class ExpressionsTest extends Abs
 		product.setId( "product1" );
 		product.setPrice( 1.23d );
 		product.setQuantity( 2 );
-		product.setPartNumber( ((long)Integer.MAX_VALUE) + 1 );
+		product.setPartNumber( Integer.MAX_VALUE + 1 );
 		product.setRating( 1.999f );
 		product.setSomeBigInteger( BigInteger.valueOf( 987654321 ) );
 		product.setSomeBigDecimal( BigDecimal.valueOf( 987654.321 ) );
@@ -247,40 +246,4 @@ public class ExpressionsTest extends Abs
 		AbstractQueryImpl hqlQueryImpl = (AbstractQueryImpl) query;
 		return hqlQueryImpl.getParameterMetadata().getNamedParameterNames().size();
 	}
-
-	public void testInExplicitTupleList() {
-		EntityManager em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-		CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
-		Root<Product> from = criteria.from( Product.class );
-		criteria.where( from.get( Product_.partNumber ).in( Collections.singletonList( ((long)Integer.MAX_VALUE) + 1 ) ) );
-		List<Product> result = em.createQuery( criteria ).getResultList();
-		assertEquals( 1, result.size() );
-		em.getTransaction().commit();
-		em.close();
-	}
-
-	public void testInExplicitTupleListVarargs() {
-		EntityManager em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-		CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
-		Root<Product> from = criteria.from( Product.class );
-		criteria.where( from.get( Product_.partNumber ).in( ((long)Integer.MAX_VALUE) + 1 ) );
-		List<Product> result = em.createQuery( criteria ).getResultList();
-		assertEquals( 1, result.size() );
-		em.getTransaction().commit();
-		em.close();
-	}
-
-	public void testInExpressionVarargs() {
-		EntityManager em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-		CriteriaQuery<Product> criteria = builder.createQuery( Product.class );
-		Root<Product> from = criteria.from( Product.class );
-		criteria.where( from.get( Product_.partNumber ).in( from.get( Product_.partNumber ) ) );
-		List<Product> result = em.createQuery( criteria ).getResultList();
-		assertEquals( 1, result.size() );
-		em.getTransaction().commit();
-		em.close();
-	}
 }
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java
@@ -38,7 +38,6 @@ import org.hibernate.ejb.util.Persistenc
  * @author Gavin King
  */
 public class HibernatePersistence extends AvailableSettings implements PersistenceProvider {
-	private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
 
 	/**
 	 * Get an entity manager factory by its entity manager name, using the specified
@@ -86,11 +85,11 @@ public class HibernatePersistence extend
 
 	private final ProviderUtil providerUtil = new ProviderUtil() {
 		public LoadState isLoadedWithoutReference(Object proxy, String property) {
-			return PersistenceUtilHelper.isLoadedWithoutReference( proxy, property, cache );
+			return PersistenceUtilHelper.isLoadedWithoutReference( proxy, property );
 		}
 
 		public LoadState isLoadedWithReference(Object proxy, String property) {
-			return PersistenceUtilHelper.isLoadedWithReference( proxy, property, cache );
+			return PersistenceUtilHelper.isLoadedWithReference( proxy, property );
 		}
 
 		public LoadState isLoaded(Object o) {
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
@@ -1,4 +1,4 @@
-// $Id: Ejb3Configuration.java 19664 2010-06-02 13:15:29Z epbernard $
+// $Id: Ejb3Configuration.java 19331 2010-04-30 19:33:42Z gbadner $
 /*
  * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
  * indicated by the @author tags or express copyright attribution
@@ -328,7 +328,7 @@ public class Ejb3Configuration implement
 						Scanner scanner = null;
 						URL jarURL = null;
 						if ( metadata.getName() == null ) {
-							scanner = buildScanner( metadata.getProps(), integration );
+							scanner = buildScanner( metadata.getProps() );
 							jarURL = JarVisitorFactory.getJarURLFromURLEntry( url, "/META-INF/persistence.xml" );
 							metadata.setName( scanner.getUnqualifiedJarName(jarURL) );
 						}
@@ -337,7 +337,7 @@ public class Ejb3Configuration implement
 						}
 						else if ( persistenceUnitName == null || metadata.getName().equals( persistenceUnitName ) ) {
 							if (scanner == null) {
-								scanner = buildScanner( metadata.getProps(), integration );
+								scanner = buildScanner( metadata.getProps() );
 								jarURL = JarVisitorFactory.getJarURLFromURLEntry( url, "/META-INF/persistence.xml" );
 							}
 							//scan main JAR
@@ -377,12 +377,8 @@ public class Ejb3Configuration implement
 		}
 	}
 
-	private Scanner buildScanner(Properties properties, Map<?,?> integration) {
-		//read the String or Instance from the integration map first and use the properties as a backup.
-		Object scanner = integration.get( AvailableSettings.SCANNER );
-		if (scanner == null) {
-			scanner = properties.getProperty( AvailableSettings.SCANNER );
-		}
+	private Scanner buildScanner(Properties properties) {
+		final Object scanner = properties.getProperty( AvailableSettings.SCANNER );
 		if (scanner != null) {
 			Class<?> scannerClass;
 			if ( scanner instanceof String ) {
@@ -573,7 +569,7 @@ public class Ejb3Configuration implement
 			ScanningContext context = new ScanningContext();
 			final Properties copyOfProperties = (Properties) info.getProperties().clone();
 			ConfigurationHelper.overrideProperties( copyOfProperties, integration );
-			context.scanner( buildScanner( copyOfProperties, integration ) )
+			context.scanner( buildScanner( copyOfProperties ) )
 					.searchOrm( searchForORMFiles )
 					.explicitMappingFiles( null ); //URLs provided by the container already
 
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
@@ -65,7 +65,6 @@ public class EntityManagerFactoryImpl im
 	private final Metamodel metamodel;
 	private final HibernatePersistenceUnitUtil util;
 	private final Map<String,Object> properties;
-	private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
 
 	@SuppressWarnings( "unchecked" )
 	public EntityManagerFactoryImpl(
@@ -183,15 +182,13 @@ public class EntityManagerFactoryImpl im
 
 	private static class HibernatePersistenceUnitUtil implements PersistenceUnitUtil, Serializable {
 		private final HibernateEntityManagerFactory emf;
-		private transient PersistenceUtilHelper.MetadataCache cache;
 
 		private HibernatePersistenceUnitUtil(EntityManagerFactoryImpl emf) {
 			this.emf = emf;
-			this.cache = emf.cache;
 		}
 
 		public boolean isLoaded(Object entity, String attributeName) {
-			LoadState state = PersistenceUtilHelper.isLoadedWithoutReference( entity, attributeName, cache );
+			LoadState state = PersistenceUtilHelper.isLoadedWithoutReference( entity, attributeName );
 			if (state == LoadState.LOADED) {
 				return true;
 			}
@@ -199,7 +196,7 @@ public class EntityManagerFactoryImpl im
 				return false;
 			}
 			else {
-				return PersistenceUtilHelper.isLoadedWithReference( entity, attributeName, cache ) != LoadState.NOT_LOADED;
+				return PersistenceUtilHelper.isLoadedWithReference( entity, attributeName ) != LoadState.NOT_LOADED;
 			}
 		}
 
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
@@ -618,14 +618,6 @@ public class AttributeFactory {
 			return member;
 		}
 
-		public String getMemberDescription() {
-			return determineMemberDescription( getMember() );
-		}
-
-		public String determineMemberDescription(Member member) {
-			return member.getDeclaringClass().getName() + '#' + member.getName();
-		}
-
 		public Class<Y> getJavaType() {
 			return javaType;
 		}
@@ -831,23 +823,20 @@ public class AttributeFactory {
 		}
 
 		private Class<?> getClassFromGenericArgument(java.lang.reflect.Type type) {
-			if ( type instanceof Class ) {
-				return (Class) type;
-			}
-			else if ( type instanceof TypeVariable ) {
-				final java.lang.reflect.Type upperBound = ( ( TypeVariable ) type ).getBounds()[0];
-				return getClassFromGenericArgument( upperBound );
-			}
-			else if ( type instanceof ParameterizedType ) {
-				final java.lang.reflect.Type rawType = ( (ParameterizedType) type ).getRawType();
-				return getClassFromGenericArgument( rawType );
+			Class<?> javaType;
+			Object unsafeElementType = type;
+			if ( unsafeElementType instanceof Class ) {
+				javaType = (Class) unsafeElementType;
+			}
+			else if ( unsafeElementType instanceof TypeVariable ) {
+				final java.lang.reflect.Type upperBound = ( ( TypeVariable ) unsafeElementType ).getBounds()[0];
+				javaType = getClassFromGenericArgument( upperBound );
 			}
 			else {
-				throw new AssertionFailure(
-						"Fail to process type argument in a generic declaration. Member : " + getMemberDescription()
-								+ " Type: " + type.getClass()
-				);
+				throw new AssertionFailure("Fail to process type argument in a generic declaration. Type: "
+						+ type.getClass() );
 			}
+			return javaType;
 		}
 
 		public ValueContext getElementValueContext() {
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java
@@ -1,20 +1,14 @@
 package org.hibernate.ejb.util;
 
-import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.AccessibleObject;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
 import javax.persistence.spi.LoadState;
 import javax.persistence.PersistenceException;
 
-import org.hibernate.AssertionFailure;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.intercept.FieldInterceptionHelper;
@@ -23,10 +17,9 @@ import org.hibernate.collection.Persiste
 
 /**
  * @author Emmanuel Bernard
- * @author Hardy Ferentschik
  */
 public class PersistenceUtilHelper {
-	public static LoadState isLoadedWithoutReference(Object proxy, String property, MetadataCache cache) {
+	public static LoadState isLoadedWithoutReference(Object proxy, String property) {
 		Object entity;
 		boolean sureFromUs = false;
 		if ( proxy instanceof HibernateProxy ) {
@@ -51,7 +44,7 @@ public class PersistenceUtilHelper {
 			if (isInitialized && interceptor != null) {
 				//property is loaded according to bytecode enhancement, but is it loaded as far as association?
 				//it's ours, we can read
-				state = isLoaded( get( entity, property, cache ) );
+				state = isLoaded( get( entity, property ) );
 				//it's ours so we know it's loaded
 				if (state == LoadState.UNKNOWN) state = LoadState.LOADED;
 			}
@@ -61,7 +54,7 @@ public class PersistenceUtilHelper {
 			else if ( sureFromUs ) { //interceptor == null
 				//property is loaded according to bytecode enhancement, but is it loaded as far as association?
 				//it's ours, we can read
-				state = isLoaded( get( entity, property, cache ) );
+				state = isLoaded( get( entity, property ) );
 				//it's ours so we know it's loaded
 				if (state == LoadState.UNKNOWN) state = LoadState.LOADED;
 			}
@@ -78,25 +71,31 @@ public class PersistenceUtilHelper {
 		}
 	}
 
-	public static LoadState isLoadedWithReference(Object proxy, String property, MetadataCache cache) {
+	public static LoadState isLoadedWithReference(Object proxy, String property) {
 		//for sure we don't instrument and for sure it's not a lazy proxy
-		Object object = get(proxy, property, cache);
+		Object object = get(proxy, property);
 		return isLoaded( object );
 	}
 
-	private static Object get(Object proxy, String property, MetadataCache cache) {
+	private static Object get(Object proxy, String property) {
 		final Class<?> clazz = proxy.getClass();
-
 		try {
-			Member member = cache.getMember( clazz, property );
-			if (member instanceof Field) {
-				return ( (Field) member ).get( proxy );
-			}
-			else if (member instanceof Method) {
-				return ( (Method) member ).invoke( proxy );
-			}
-			else {
-				throw new AssertionFailure( "Member object neither Field nor Method: " + member);
+			try {
+				final Field field = clazz.getField( property );
+				setAccessibility( field );
+				return field.get( proxy );
+			}
+			catch ( NoSuchFieldException e ) {
+				final Method method = getMethod( clazz, property );
+				if (method != null) {
+					setAccessibility( method );
+					return method.invoke( proxy );
+				}
+				else {
+					throw new PersistenceException( "Unable to find field or method: "
+							+ clazz + "#"
+							+ property);
+				}
 			}
 		}
 		catch ( IllegalAccessException e ) {
@@ -111,25 +110,6 @@ public class PersistenceUtilHelper {
 		}
 	}
 
-	private static void setAccessibility(Member member) {
-		//Sun's ease of use, sigh...
-		( ( AccessibleObject ) member ).setAccessible( true );
-	}
-
-	public static LoadState isLoaded(Object o) {
-		if ( o instanceof HibernateProxy ) {
-			final boolean isInitialized = !( ( HibernateProxy ) o ).getHibernateLazyInitializer().isUninitialized();
-			return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
-		}
-		else if ( o instanceof PersistentCollection ) {
-			final boolean isInitialized = ( ( PersistentCollection ) o ).wasInitialized();
-			return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
-		}
-		else {
-			return LoadState.UNKNOWN;
-		}
-	}
-
 	/**
 	 * Returns the method with the specified name or <code>null</code> if it does not exist.
 	 *
@@ -144,10 +124,10 @@ public class PersistenceUtilHelper {
 			string[0] = Character.toUpperCase( string[0] );
 			methodName = new String( string );
 			try {
-				return clazz.getDeclaredMethod( "get" + methodName );
+				return clazz.getMethod( "get" + methodName );
 			}
 			catch ( NoSuchMethodException e ) {
-				return clazz.getDeclaredMethod( "is" + methodName );
+				return clazz.getMethod( "is" + methodName );
 			}
 		}
 		catch ( NoSuchMethodException e ) {
@@ -155,83 +135,24 @@ public class PersistenceUtilHelper {
 		}
 	}
 
-	/**
-	 * Cache hierarchy and member resolution in a weak hash map
-	 */
-	//TODO not really thread-safe
-	public static class MetadataCache implements Serializable {
-		private transient Map<Class<?>, ClassCache> classCache = new WeakHashMap<Class<?>, ClassCache>();
-
-
-		private void readObject(java.io.ObjectInputStream stream) {
-			classCache = new WeakHashMap<Class<?>, ClassCache>();
-		}
-
-		Member getMember(Class<?> clazz, String property) {
-			ClassCache cache = classCache.get( clazz );
-			if (cache == null) {
-				cache = new ClassCache(clazz);
-				classCache.put( clazz, cache );
-			}
-			Member member = cache.members.get( property );
-			if ( member == null ) {
-				member = findMember( clazz, property );
-				cache.members.put( property, member );
-			}
-			return member;
-		}
-
-		private Member findMember(Class<?> clazz, String property) {
-			final List<Class<?>> classes = getClassHierarchy( clazz );
-
-			for (Class current : classes) {
-				final Field field;
-				try {
-					field = current.getDeclaredField( property );
-					setAccessibility( field );
-					return field;
-				}
-				catch ( NoSuchFieldException e ) {
-					final Method method = getMethod( current, property );
-					if (method != null) {
-						setAccessibility( method );
-						return method;
-					}
-				}
-			}
-			//we could not find any match
-			throw new PersistenceException( "Unable to find field or method: "
-							+ clazz + "#"
-							+ property);
+	private static void setAccessibility(Member member) {
+		if ( !Modifier.isPublic( member.getModifiers() ) ) {
+			//Sun's ease of use, sigh...
+			( ( AccessibleObject ) member ).setAccessible( true );
 		}
+	}
 
-		private List<Class<?>> getClassHierarchy(Class<?> clazz) {
-			ClassCache cache = classCache.get( clazz );
-			if (cache == null) {
-				cache = new ClassCache(clazz);
-				classCache.put( clazz, cache );
-			}
-			return cache.classHierarchy;
+	public static LoadState isLoaded(Object o) {
+		if ( o instanceof HibernateProxy ) {
+			final boolean isInitialized = !( ( HibernateProxy ) o ).getHibernateLazyInitializer().isUninitialized();
+			return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
 		}
-
-		private static List<Class<?>> findClassHierarchy(Class<?> clazz) {
-			List<Class<?>> classes = new ArrayList<Class<?>>();
-			Class<?> current = clazz;
-			do {
-				classes.add( current );
-				current = current.getSuperclass();
-			}
-			while ( current != null );
-			return classes;
+		else if ( o instanceof PersistentCollection ) {
+			final boolean isInitialized = ( ( PersistentCollection ) o ).wasInitialized();
+			return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
 		}
-
-		private static class ClassCache {
-			List<Class<?>> classHierarchy;
-			Map<String, Member> members = new HashMap<String, Member>();
-
-			public ClassCache(Class<?> clazz) {
-				classHierarchy = findClassHierarchy( clazz );
-			}
+		else {
+			return LoadState.UNKNOWN;
 		}
 	}
 
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java
@@ -88,7 +88,7 @@ public abstract class ExpressionImpl<T>
 	 * {@inheritDoc}
 	 */
 	public Predicate in(Collection<?> values) {
-		return criteriaBuilder().in( this, values.toArray() );
+		return criteriaBuilder().in( this, values );
 	}
 
 	/**
--- libhibernate3-java-3.5.4.Final.orig/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java
+++ libhibernate3-java-3.5.4.Final/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java
@@ -28,7 +28,7 @@ import org.hibernate.util.IdentityMap;
 
 /**
  * In EJB3, it is the create operation that is cascaded to unmanaged
- * entities at flush time (instead of the save-update operation in
+ * ebtities at flush time (instead of the save-update operation in
  * Hibernate).
  *
  * @author Gavin King
--- libhibernate3-java-3.5.4.Final.orig/hibernate-maven-plugin/pom.xml
+++ libhibernate3-java-3.5.4.Final/hibernate-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>hibernate-parent</artifactId>
         <groupId>org.hibernate</groupId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/envers/pom.xml
+++ libhibernate3-java-3.5.4.Final/envers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -122,12 +122,6 @@
             <artifactId>javassist</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- For JTA tests -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-testing</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -148,11 +142,6 @@
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-testing</artifactId>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-tools</artifactId>
                 <version>3.2.0.ga</version>
--- libhibernate3-java-3.5.4.Final.orig/envers/src/test/resources/testng.xml
+++ libhibernate3-java-3.5.4.Final/envers/src/test/resources/testng.xml
@@ -41,10 +41,8 @@
             <package name="org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.subclass" />
             <package name="org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.joined" />
             <package name="org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.union" />
-            <package name="org.hibernate.envers.test.integration.jta" />
             <package name="org.hibernate.envers.test.integration.manytomany" />
             <package name="org.hibernate.envers.test.integration.manytomany.biowned" />
-            <package name="org.hibernate.envers.test.integration.manytomany.inverseToSuperclass" />
             <package name="org.hibernate.envers.test.integration.manytomany.sametable" />
             <package name="org.hibernate.envers.test.integration.manytomany.ternary" />
             <package name="org.hibernate.envers.test.integration.manytomany.unidirectional" />
@@ -55,7 +53,6 @@
             <package name="org.hibernate.envers.test.integration.notinsertable.manytoone" />
             <package name="org.hibernate.envers.test.integration.onetomany" />
             <package name="org.hibernate.envers.test.integration.onetomany.detached" />
-            <package name="org.hibernate.envers.test.integration.onetomany.inverseToSuperclass" />
             <package name="org.hibernate.envers.test.integration.onetoone.bidirectional" />
             <package name="org.hibernate.envers.test.integration.onetoone.bidirectional.ids" />
             <package name="org.hibernate.envers.test.integration.onetoone.unidirectional" />
@@ -72,13 +69,6 @@
             <package name="org.hibernate.envers.test.integration.secondary.ids" />
             <package name="org.hibernate.envers.test.integration.serialization" />
             <package name="org.hibernate.envers.test.integration.superclass" />
-
-            <package name="org.hibernate.envers.test.entityNames.auditedEntity" />
-            <package name="org.hibernate.envers.test.entityNames.manyToManyAudited" />
-            <package name="org.hibernate.envers.test.entityNames.oneToManyAudited" />
-            <package name="org.hibernate.envers.test.entityNames.oneToManyNotAudited" />
-            <package name="org.hibernate.envers.test.entityNames.singleAssociatedAudited" />
-            <package name="org.hibernate.envers.test.entityNames.singleAssociatedNotAudited" />
         </packages>
     </test>
 </suite>
--- libhibernate3-java-3.5.4.Final.orig/envers/src/test/resources/hibernate.test.cfg.xml
+++ libhibernate3-java-3.5.4.Final/envers/src/test/resources/hibernate.test.cfg.xml
@@ -12,10 +12,10 @@
         <property name="format_sql">true</property>
 
         <property name="dialect">org.hibernate.dialect.H2Dialect</property>
+        <property name="connection.url">jdbc:h2:mem:envers</property>
         <property name="connection.driver_class">org.h2.Driver</property>
         <property name="connection.username">sa</property>
         <property name="connection.password"></property>
-        <!-- The connection URL is set in AbstractEntityTest -->
 
         <!--<property name="dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property>-->
         <!--<property name="connection.url">jdbc:mysql:///hibernate_tests?useUnicode=true&amp;characterEncoding=UTF-8</property>-->
@@ -44,4 +44,4 @@
             <listener class="org.hibernate.envers.event.AuditEventListener" />
         </event>-->
     </session-factory>
-</hibernate-configuration>
+</hibernate-configuration>
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java
+++ libhibernate3-java-3.5.4.Final/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java
@@ -27,14 +27,12 @@ import java.io.IOException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.hibernate.cfg.Environment;
-import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.event.AuditEventListener;
-import org.hibernate.test.tm.ConnectionProviderImpl;
-import org.hibernate.test.tm.TransactionManagerLookupImpl;
-import org.testng.annotations.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.AfterClass;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.event.*;
@@ -91,12 +89,7 @@ public abstract class AbstractEntityTest
         if (audited) {
             initListeners();
         }
-
         cfg.configure("hibernate.test.cfg.xml");
-
-        // Separate database for each test class
-        cfg.setProperty("hibernate.connection.url", "jdbc:h2:mem:" + this.getClass().getName());
-
         configure(cfg);
         emf = cfg.buildEntityManagerFactory();
 
@@ -120,10 +113,4 @@ public abstract class AbstractEntityTest
     public Ejb3Configuration getCfg() {
         return cfg;
     }
-
-    protected void addJTAConfig(Ejb3Configuration cfg) {        
-        cfg.setProperty("connection.provider_class", ConnectionProviderImpl.class.getName());
-		cfg.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, TransactionManagerLookupImpl.class.getName());
-		cfg.setProperty(AvailableSettings.TRANSACTION_TYPE, "JTA");
-    }
 }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/AuditReader.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/AuditReader.java
@@ -32,7 +32,7 @@ import org.hibernate.envers.query.AuditQ
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
+ * @author Hernan Chanfreau
  */
 public interface AuditReader {
     /**
@@ -49,23 +49,6 @@ public interface AuditReader {
      */
     <T> T find(Class<T> cls, Object primaryKey, Number revision) throws
             IllegalArgumentException, NotAuditedException, IllegalStateException;
-    
-    /**
-     * Find an entity by primary key at the given revision with the specified entityName.
-     * @param cls Class of the entity.
-     * @param entityName EntityName to find.
-     * @param primaryKey Primary key of the entity.
-     * @param revision Revision in which to get the entity.
-     * @return The found entity instance at the given revision (its properties may be partially filled
-     * if not all properties are audited) or null, if an entity with that id didn't exist at that
-     * revision.
-     * @throws IllegalArgumentException If cls or primaryKey is null or revision is less or equal to 0.
-     * @throws NotAuditedException When entities of the given class are not audited.
-     * @throws IllegalStateException If the associated entity manager is closed.
-     */
-	<T> T find(Class<T> cls, String entityName, Object primaryKey,
-			Number revision) throws IllegalArgumentException,
-			NotAuditedException, IllegalStateException;
 
     /**
      * Get a list of revision numbers, at which an entity was modified.
@@ -79,21 +62,6 @@ public interface AuditReader {
      */
     List<Number> getRevisions(Class<?> cls, Object primaryKey)
             throws IllegalArgumentException, NotAuditedException, IllegalStateException;
-    
-    /**
-     * Get a list of revision numbers, at which an entity was modified, looking by entityName.
-     * @param cls Class of the entity.
-     * @param entityName  EntityName to find.
-     * @param primaryKey Primary key of the entity.
-     * @return A list of revision numbers, at which the entity was modified, sorted in ascending order (so older
-     * revisions come first).
-     * @throws NotAuditedException When entities of the given class are not audited.
-     * @throws IllegalArgumentException If cls or primaryKey is null.
-     * @throws IllegalStateException If the associated entity manager is closed.
-     */
-    List<Number> getRevisions(Class<?> cls, String entityName, Object primaryKey)
-			throws IllegalArgumentException, NotAuditedException,
-			IllegalStateException;
 
     /**
      * Get the date, at which a revision was created.
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java
@@ -80,7 +80,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Generates metadata for a collection-valued property.
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public final class CollectionMetadataGenerator {
     private static final Logger log = LoggerFactory.getLogger(CollectionMetadataGenerator.class);
@@ -209,7 +208,7 @@ public final class CollectionMetadataGen
                     // The mapper will only be used to map from entity to map, so no need to provide other details
                     // when constructing the PropertyData.
                     new PropertyData(auditMappedBy, null, null, null),
-                    referencingEntityName, false);
+                    referencedEntityName, false);
 
             // Checking if there's an index defined. If so, adding a mapper for it.
             if (propertyAuditingData.getPositionMappedBy() != null) {
@@ -534,6 +533,7 @@ public final class CollectionMetadataGen
         return middleEntityXmlId;
     }
 
+    @SuppressWarnings({"unchecked"})
     private String getMappedBy(Collection collectionValue) {
         PersistentClass referencedClass = ((OneToMany) collectionValue.getElement()).getAssociatedClass();
 
@@ -543,31 +543,8 @@ public final class CollectionMetadataGen
             return auditMappedBy;
         }
 
-        // searching in referenced class
-        String mappedBy = this.searchMappedBy(referencedClass, collectionValue);
-        
-        if(mappedBy == null) {
-            log.debug("Going to search the mapped by attribute for " + propertyName + " in superclasses of entity: " + referencedClass.getClassName());
-            
-            PersistentClass tempClass = referencedClass;
-			while ((mappedBy == null) && (tempClass.getSuperclass() != null)) {
-	            log.debug("Searching in superclass: " + tempClass.getSuperclass().getClassName());
-				mappedBy = this.searchMappedBy(tempClass.getSuperclass(), collectionValue);
-				tempClass = tempClass.getSuperclass();
-			}
-        }
-
-        if(mappedBy == null) { 
-	        throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in "
-	                + referencedClass.getClassName() + "!");
-        }
-        
-        return mappedBy;
-    }        
-
-    @SuppressWarnings({"unchecked"})
-    private String searchMappedBy(PersistentClass referencedClass, Collection collectionValue) {
         Iterator<Property> assocClassProps = referencedClass.getPropertyIterator();
+
         while (assocClassProps.hasNext()) {
             Property property = assocClassProps.next();
 
@@ -575,10 +552,13 @@ public final class CollectionMetadataGen
                     collectionValue.getKey().getColumnIterator())) {
                 return property.getName();
             }
-        }    	
-        return null;
+        }
+
+        throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in "
+                + referencingEntityName + "!");
     }
 
+    @SuppressWarnings({"unchecked"})
     private String getMappedBy(Table collectionTable, PersistentClass referencedClass) {
         // If there's an @AuditMappedBy specified, returning it directly.
         String auditMappedBy = propertyAuditingData.getAuditMappedBy();
@@ -586,31 +566,6 @@ public final class CollectionMetadataGen
             return auditMappedBy;
         }
 
-        // searching in referenced class
-        String mappedBy = this.searchMappedBy(referencedClass, collectionTable);
-
-        // not found on referenced class, searching on superclasses
-        if(mappedBy == null) { 
-            log.debug("Going to search the mapped by attribute for " + propertyName + " in superclases of entity: " + referencedClass.getClassName());
-
-            PersistentClass tempClass = referencedClass;
-			while ((mappedBy == null) && (tempClass.getSuperclass() != null)) {
-	            log.debug("Searching in superclass: " + tempClass.getSuperclass().getClassName());
-				mappedBy = this.searchMappedBy(tempClass.getSuperclass(), collectionTable);
-				tempClass = tempClass.getSuperclass();
-			}
-        }
-
-        if(mappedBy == null) { 
-	        throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in "
-	                + referencedClass.getClassName() + "!");
-        }
-        
-        return mappedBy;
-    }
-    
-    @SuppressWarnings({"unchecked"})
-    private String searchMappedBy(PersistentClass referencedClass, Table collectionTable) {
         Iterator<Property> properties = referencedClass.getPropertyIterator();
         while (properties.hasNext()) {
             Property property = properties.next();
@@ -621,8 +576,9 @@ public final class CollectionMetadataGen
                     return property.getName();
                 }
             }
-        }   
-        return null;
+        }
+
+        throw new MappingException("Unable to read the mapped by attribute for " + propertyName + " in "
+                + referencingEntityName + "!");
     }
-   
 }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
@@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory;
  * @author Adam Warski (adam at warski dot org)
  * @author Sebastian Komander
  * @author Tomasz Bech
- * @author Hernn Chanfreau
  */
 public final class AuditMetadataGenerator {
     private static final Logger log = LoggerFactory.getLogger(AuditMetadataGenerator.class);
@@ -354,7 +353,7 @@ public final class AuditMetadataGenerato
 
 			ExtendedPropertyMapper propertyMapper = null;
 			String parentEntityName = null;
-			EntityConfiguration entityCfg = new EntityConfiguration(entityName, pc.getClassName(), idMapper, propertyMapper,
+			EntityConfiguration entityCfg = new EntityConfiguration(entityName, idMapper, propertyMapper,
 					parentEntityName);
 			notAuditedEntitiesConfigurations.put(entityName, entityCfg);
 			return;
@@ -428,7 +427,7 @@ public final class AuditMetadataGenerato
         addJoins(pc, propertyMapper, auditingData, pc.getEntityName(), xmlMappingData, true);
 
         // Storing the generated configuration
-        EntityConfiguration entityCfg = new EntityConfiguration(auditEntityName,pc.getClassName(), idMapper,
+        EntityConfiguration entityCfg = new EntityConfiguration(auditEntityName, idMapper,
                 propertyMapper, parentEntityName);
         entitiesConfigurations.put(pc.getEntityName(), entityCfg);
     }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java
@@ -32,7 +32,6 @@ import static org.hibernate.envers.tools
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class AuditQueryCreator {
     private final AuditConfiguration auditCfg;
@@ -57,22 +56,6 @@ public class AuditQueryCreator {
         checkPositive(revision, "Entity revision");
         return new EntitiesAtRevisionQuery(auditCfg, auditReaderImplementor, c, revision);
     }
-    
-    /**
-     * Creates a query, which will return entities satisfying some conditions (specified later),
-     * at a given revision and a given entityName.
-     * @param c Class of the entities for which to query.
-     * @param entityName EntityName of the entities for which to query.
-     * @param revision Revision number at which to execute the query.
-     * @return A query for entities at a given revision, to which conditions can be added and which
-     * can then be executed. The result of the query will be a list of entities (beans), unless a
-     * projection is added.
-     */
-    public AuditQuery forEntitiesAtRevision(Class<?> c, String entityName, Number revision) {
-        checkNotNull(revision, "Entity revision");
-        checkPositive(revision, "Entity revision");
-        return new EntitiesAtRevisionQuery(auditCfg, auditReaderImplementor, c, entityName, revision);
-    }    
 
     /**
      * Creates a query, which selects the revisions, at which the given entity was modified.
@@ -97,30 +80,4 @@ public class AuditQueryCreator {
     public AuditQuery forRevisionsOfEntity(Class<?> c, boolean selectEntitiesOnly, boolean selectDeletedEntities) {
         return new RevisionsOfEntityQuery(auditCfg, auditReaderImplementor, c, selectEntitiesOnly,selectDeletedEntities);
     }
-    
-    /**
-     * Creates a query, which selects the revisions, at which the given entity was modified and with a given entityName.
-     * Unless an explicit projection is set, the result will be a list of three-element arrays, containing:
-     * <ol>
-     * <li>the entity instance</li>
-     * <li>revision entity, corresponding to the revision at which the entity was modified. If no custom
-     * revision entity is used, this will be an instance of {@link org.hibernate.envers.DefaultRevisionEntity}</li>
-     * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>.
-     * </ol>
-     * Additional conditions that the results must satisfy may be specified.
-     * @param c Class of the entities for which to query.
-     * @param entityName EntityName of the entities for which to query.
-     * @param selectEntitiesOnly If true, instead of a list of three-element arrays, a list of entites will be
-     * returned as a result of executing this query.
-     * @param selectDeletedEntities If true, also revisions where entities were deleted will be returned. The additional
-     * entities will have revision type "delete", and contain no data (all fields null), except for the id field.
-     * @return A query for revisions at which instances of the given entity were modified, to which
-     * conditions can be added (for example - a specific id of an entity of class <code>c</code>), and which
-     * can then be executed. The results of the query will be sorted in ascending order by the revision number,
-     * unless an order or projection is added.
-     */
-    public AuditQuery forRevisionsOfEntity(Class<?> c, String entityName, boolean selectEntitiesOnly, boolean selectDeletedEntities) {
-        return new RevisionsOfEntityQuery(auditCfg, auditReaderImplementor, c, entityName, selectEntitiesOnly,selectDeletedEntities);
-    }
-    
 }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java
@@ -50,14 +50,12 @@ import org.hibernate.LockOptions;
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public abstract class AbstractAuditQuery implements AuditQuery {
     protected EntityInstantiator entityInstantiator;
     protected List<AuditCriterion> criterions;
 
     protected String entityName;
-    protected String entityClassName;
     protected String versionsEntityName;
     protected QueryBuilder qb;
 
@@ -69,25 +67,18 @@ public abstract class AbstractAuditQuery
 
     protected AbstractAuditQuery(AuditConfiguration verCfg, AuditReaderImplementor versionsReader,
                                     Class<?> cls) {
-    	this(verCfg, versionsReader, cls, cls.getName());
+        this.verCfg = verCfg;
+        this.versionsReader = versionsReader;
+
+        criterions = new ArrayList<AuditCriterion>();
+        entityInstantiator = new EntityInstantiator(verCfg, versionsReader);
+
+        entityName = cls.getName();
+        versionsEntityName = verCfg.getAuditEntCfg().getAuditEntityName(entityName);
+
+        qb = new QueryBuilder(versionsEntityName, "e");
     }
 
-	protected AbstractAuditQuery(AuditConfiguration verCfg,
-			AuditReaderImplementor versionsReader, Class<?> cls, String entityName) {
-		this.verCfg = verCfg;
-		this.versionsReader = versionsReader;
-
-		criterions = new ArrayList<AuditCriterion>();
-		entityInstantiator = new EntityInstantiator(verCfg, versionsReader);
-
-		entityClassName = cls.getName();
-		this.entityName = entityName;
-		versionsEntityName = verCfg.getAuditEntCfg().getAuditEntityName(
-				entityName);
-
-		qb = new QueryBuilder(versionsEntityName, "e");
-	}
-    
     protected List buildAndExecuteQuery() {
         StringBuilder querySb = new StringBuilder();
         Map<String, Object> queryParamValues = new HashMap<String, Object>();
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java
@@ -35,7 +35,6 @@ import org.hibernate.envers.tools.query.
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class EntitiesAtRevisionQuery extends AbstractAuditQuery {
     private final Number revision;
@@ -46,12 +45,6 @@ public class EntitiesAtRevisionQuery ext
         super(verCfg, versionsReader, cls);
         this.revision = revision;
     }
-    
-	public EntitiesAtRevisionQuery(AuditConfiguration verCfg,
-			AuditReaderImplementor versionsReader, Class<?> cls, String entityName, Number revision) {
-		super(verCfg, versionsReader, cls, entityName);
-		this.revision = revision;
-	}    
 
     @SuppressWarnings({"unchecked"})
     public List list() {
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java
@@ -33,11 +33,11 @@ import org.hibernate.envers.configuratio
 import org.hibernate.envers.exception.AuditException;
 import org.hibernate.envers.query.criteria.AuditCriterion;
 import org.hibernate.envers.reader.AuditReaderImplementor;
+
 import org.hibernate.proxy.HibernateProxy;
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class RevisionsOfEntityQuery extends AbstractAuditQuery {
     private final boolean selectEntitiesOnly;
@@ -53,15 +53,6 @@ public class RevisionsOfEntityQuery exte
         this.selectDeletedEntities = selectDeletedEntities;
     }
 
-	public RevisionsOfEntityQuery(AuditConfiguration verCfg,
-			AuditReaderImplementor versionsReader, Class<?> cls, String entityName,
-			boolean selectEntitiesOnly, boolean selectDeletedEntities) {
-		super(verCfg, versionsReader, cls, entityName);
-
-		this.selectEntitiesOnly = selectEntitiesOnly;
-		this.selectDeletedEntities = selectDeletedEntities;
-	}
-	
     private Number getRevisionNumber(Map versionsEntity) {
         AuditEntitiesConfiguration verEntCfg = verCfg.getAuditEntCfg();
 
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java
@@ -36,7 +36,6 @@ import org.hibernate.util.ReflectHelper;
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class EntityInstantiator {
     private final AuditConfiguration verCfg;
@@ -81,13 +80,7 @@ public class EntityInstantiator {
         // If it is not in the cache, creating a new entity instance
         Object ret;
         try {
-        	EntityConfiguration entCfg = verCfg.getEntCfg().get(entityName);
-        	if(entCfg == null) {
-        		// a relation marked as RelationTargetAuditMode.NOT_AUDITED 
-        		entCfg = verCfg.getEntCfg().getNotVersionEntityConfiguration(entityName);
-        	}
-
-            Class<?> cls = ReflectionTools.loadClass(entCfg.getEntityClassName());
+            Class<?> cls = ReflectionTools.loadClass(entityName);
             ret = ReflectHelper.getDefaultConstructor(cls).newInstance();
         } catch (Exception e) {
             throw new AuditException(e);
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java
@@ -32,22 +32,18 @@ import org.hibernate.envers.entities.map
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class EntityConfiguration {
     private String versionsEntityName;
-    /** Holds the className for instantiation the configured entity */
-    private String entityClassName;
-	private IdMappingData idMappingData;
+    private IdMappingData idMappingData;
     private ExtendedPropertyMapper propertyMapper;
     // Maps from property name
     private Map<String, RelationDescription> relations;
     private String parentEntityName;
 
-    public EntityConfiguration(String versionsEntityName, String entityClassName, IdMappingData idMappingData,
+    public EntityConfiguration(String versionsEntityName, IdMappingData idMappingData,
                                ExtendedPropertyMapper propertyMapper, String parentEntityName) {
         this.versionsEntityName = versionsEntityName;
-        this.entityClassName = entityClassName;
         this.idMappingData = idMappingData;
         this.propertyMapper = propertyMapper;
         this.parentEntityName = parentEntityName;
@@ -104,12 +100,12 @@ public class EntityConfiguration {
         return propertyMapper;
     }
 
-    public String getParentEntityName() {
+    // For use by EntitiesConfigurations
+
+    String getParentEntityName() {
         return parentEntityName;
     }
 
-    // For use by EntitiesConfigurations
-
     String getVersionsEntityName() {
         return versionsEntityName;
     }
@@ -117,11 +113,4 @@ public class EntityConfiguration {
     Iterable<RelationDescription> getRelationsIterator() {
         return relations.values();
     }
-    
-    /**
-     * @return the className for the configured entity
-     */
-    public String getEntityClassName() {
-		return entityClassName;
-	}    
 }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
@@ -24,19 +24,19 @@
 package org.hibernate.envers.entities.mapper;
 
 import java.io.Serializable;
-import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.envers.configuration.AuditConfiguration;
 import org.hibernate.envers.entities.PropertyData;
+import org.hibernate.envers.configuration.AuditConfiguration;
 import org.hibernate.envers.exception.AuditException;
 import org.hibernate.envers.reader.AuditReaderImplementor;
 import org.hibernate.envers.tools.reflection.ReflectionTools;
+
+import org.hibernate.collection.PersistentCollection;
 import org.hibernate.property.Setter;
 import org.hibernate.util.ReflectHelper;
+import org.hibernate.engine.SessionImplementor;
 
 /**
  * @author Adam Warski (adam at warski dot org)
@@ -84,12 +84,8 @@ public class ComponentPropertyMapper imp
 			}
 		}
 
-		if (allNullAndSingle) {
-			// single property, but default value need not be null, so we'll set it to null anyway 
-			setter.set(obj, null, null);
-			
-		} else {
-			// set the component
+		// And we don't have to set anything on the object - the default value is null
+		if (!allNullAndSingle) {
 			try {
 				Object subObj = ReflectHelper.getDefaultConstructor(
 						Thread.currentThread().getContextClassLoader().loadClass(componentClassName)).newInstance();
@@ -101,7 +97,7 @@ public class ComponentPropertyMapper imp
 		}
     }
 
- 	public List<PersistentCollectionChangeData> mapCollectionChanges(String referencingPropertyName,
+    public List<PersistentCollectionChangeData> mapCollectionChanges(String referencingPropertyName,
                                                                                     PersistentCollection newColl,
                                                                                     Serializable oldColl,
                                                                                     Serializable id) {
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
@@ -33,7 +33,6 @@ import org.hibernate.envers.entities.map
 import org.hibernate.envers.entities.mapper.PropertyMapper;
 import org.hibernate.envers.entities.mapper.id.IdMapper;
 import org.hibernate.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor;
-import org.hibernate.envers.entities.EntityConfiguration;
 import org.hibernate.envers.entities.PropertyData;
 import org.hibernate.envers.reader.AuditReaderImplementor;
 import org.hibernate.envers.tools.Tools;
@@ -45,7 +44,6 @@ import org.hibernate.engine.SessionImple
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class ToOneIdMapper implements PropertyMapper {
     private final IdMapper delegate;
@@ -70,7 +68,7 @@ public class ToOneIdMapper implements Pr
         delegate.mapToMapFromEntity(newData, nonInsertableFake ? oldObj : newObj);
 
         //noinspection SimplifiableConditionalExpression
-        return nonInsertableFake ? false : !Tools.entitiesEqual(session, referencedEntityName, newObj, oldObj);
+        return nonInsertableFake ? false : !Tools.entitiesEqual(session, newObj, oldObj);
     }
 
     public void mapToEntityFromMap(AuditConfiguration verCfg, Object obj, Map data, Object primaryKey,
@@ -87,13 +85,7 @@ public class ToOneIdMapper implements Pr
             if (versionsReader.getFirstLevelCache().contains(referencedEntityName, revision, entityId)) {
                 value = versionsReader.getFirstLevelCache().get(referencedEntityName, revision, entityId);
             } else {
-            	EntityConfiguration entCfg = verCfg.getEntCfg().get(referencedEntityName);
-            	if(entCfg == null) {
-            		// a relation marked as RelationTargetAuditMode.NOT_AUDITED 
-            		entCfg = verCfg.getEntCfg().getNotVersionEntityConfiguration(referencedEntityName);
-            	}
-            	
-                Class<?> entityClass = ReflectionTools.loadClass(entCfg.getEntityClassName());
+                Class<?> entityClass = ReflectionTools.loadClass(referencedEntityName);
 
                 value = versionsReader.getSessionImplementor().getFactory().getEntityPersister(referencedEntityName).
                         createProxy((Serializable)entityId, new ToOneDelegateSessionImplementor(versionsReader, entityClass, entityId, revision, verCfg));
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
@@ -31,7 +31,6 @@ import javax.persistence.NoResultExcepti
 import org.hibernate.envers.configuration.AuditConfiguration;
 import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData;
 import org.hibernate.envers.entities.mapper.PropertyMapper;
-import org.hibernate.envers.entities.EntityConfiguration;
 import org.hibernate.envers.entities.PropertyData;
 import org.hibernate.envers.exception.AuditException;
 import org.hibernate.envers.query.AuditEntity;
@@ -45,7 +44,6 @@ import org.hibernate.property.Setter;
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class OneToOneNotOwningMapper implements PropertyMapper {
     private String owningReferencePropertyName;
@@ -68,18 +66,12 @@ public class OneToOneNotOwningMapper imp
             return;
         }
 
-    	EntityConfiguration entCfg = verCfg.getEntCfg().get(owningEntityName);
-    	if(entCfg == null) {
-    		// a relation marked as RelationTargetAuditMode.NOT_AUDITED 
-    		entCfg = verCfg.getEntCfg().getNotVersionEntityConfiguration(owningEntityName);
-    	}
-
-        Class<?> entityClass = ReflectionTools.loadClass(entCfg.getEntityClassName());
+        Class<?> entityClass = ReflectionTools.loadClass(owningEntityName);
 
         Object value;
 
         try {
-            value = versionsReader.createQuery().forEntitiesAtRevision(entityClass, owningEntityName, revision)
+            value = versionsReader.createQuery().forEntitiesAtRevision(entityClass, revision)
                     .add(AuditEntity.relatedId(owningReferencePropertyName).eq(primaryKey)).getSingleResult();
         } catch (NoResultException e) {
             value = null;
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
@@ -27,6 +27,7 @@ import java.io.Serializable;
 
 import org.hibernate.envers.configuration.AuditConfiguration;
 import org.hibernate.envers.entities.EntitiesConfigurations;
+import org.hibernate.envers.entities.EntityConfiguration;
 import org.hibernate.envers.reader.AuditReaderImplementor;
 
 import org.hibernate.HibernateException;
@@ -34,7 +35,6 @@ import org.hibernate.HibernateException;
 /**
  * @author Adam Warski (adam at warski dot org)
  * @author Tomasz Bech
- * @author Hernn Chanfreau
  */
 public class ToOneDelegateSessionImplementor extends AbstractDelegateSessionImplementor {
 	private static final long serialVersionUID = 4770438372940785488L;
@@ -43,7 +43,7 @@ public class ToOneDelegateSessionImpleme
     private final Class<?> entityClass;
     private final Object entityId;
     private final Number revision;
-    private EntitiesConfigurations entCfg;
+	private EntityConfiguration notVersionedEntityConfiguration;
 
 	public ToOneDelegateSessionImplementor(AuditReaderImplementor versionsReader,
                                            Class<?> entityClass, Object entityId, Number revision,
@@ -53,15 +53,14 @@ public class ToOneDelegateSessionImpleme
         this.entityClass = entityClass;
         this.entityId = entityId;
         this.revision = revision;
-        this.entCfg = verCfg.getEntCfg();
+        EntitiesConfigurations entCfg = verCfg.getEntCfg();
+        notVersionedEntityConfiguration = entCfg.getNotVersionEntityConfiguration(entityClass.getName());
     }
 
     public Object doImmediateLoad(String entityName) throws HibernateException {
-    	if(entCfg.getNotVersionEntityConfiguration(entityName) == null){
-    		// audited relation, look up entity with envers
-			return versionsReader.find(entityClass, entityName, entityId, revision);
+		if (notVersionedEntityConfiguration == null) {
+			return versionsReader.find(entityClass, entityId, revision);
 		} else {
-			// notAudited relation, look up entity with hibernate
 			return delegate.immediateLoad(entityName, (Serializable) entityId);
 		}
     }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/reader/AuditReaderImpl.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/reader/AuditReaderImpl.java
@@ -46,7 +46,7 @@ import org.hibernate.engine.SessionImple
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
+ * @author Hernan Chanfreau
  */
 public class AuditReaderImpl implements AuditReaderImplementor {
     private final AuditConfiguration verCfg;
@@ -81,22 +81,17 @@ public class AuditReaderImpl implements
         return firstLevelCache;
     }
 
-    public <T> T find(Class<T> cls, Object primaryKey, Number revision) throws
-            IllegalArgumentException, NotAuditedException, IllegalStateException {
-    	
-    	return this.find(cls, cls.getName(), primaryKey, revision);
-    }
-    
     @SuppressWarnings({"unchecked"})
-    public <T> T find(Class<T> cls, String entityName, Object primaryKey, Number revision) throws
+    public <T> T find(Class<T> cls, Object primaryKey, Number revision) throws
             IllegalArgumentException, NotAuditedException, IllegalStateException {
         checkNotNull(cls, "Entity class");
-        checkNotNull(entityName, "Entity name");
         checkNotNull(primaryKey, "Primary key");
         checkNotNull(revision, "Entity revision");
         checkPositive(revision, "Entity revision");
         checkSession();
 
+        String entityName = cls.getName();
+
         if (!verCfg.getEntCfg().isVersioned(entityName)) {
             throw new NotAuditedException(entityName, entityName + " is not versioned!");
         }
@@ -108,7 +103,7 @@ public class AuditReaderImpl implements
         Object result;
         try {
             // The result is put into the cache by the entity instantiator called from the query
-            result = createQuery().forEntitiesAtRevision(cls, entityName, revision)
+            result = createQuery().forEntitiesAtRevision(cls, revision)
                 .add(AuditEntity.id().eq(primaryKey)).getSingleResult();
         } catch (NoResultException e) {
             result = null;
@@ -117,28 +112,23 @@ public class AuditReaderImpl implements
         }
 
         return (T) result;
-    }    
-
-    public List<Number> getRevisions(Class<?> cls, Object primaryKey)
-            throws IllegalArgumentException, NotAuditedException, IllegalStateException {
-    	
-    	return this.getRevisions(cls, cls.getName(), primaryKey);
     }
 
     @SuppressWarnings({"unchecked"})
-    public List<Number> getRevisions(Class<?> cls, String entityName, Object primaryKey)
+    public List<Number> getRevisions(Class<?> cls, Object primaryKey)
             throws IllegalArgumentException, NotAuditedException, IllegalStateException {
         // todo: if a class is not versioned from the beginning, there's a missing ADD rev - what then?
         checkNotNull(cls, "Entity class");
-        checkNotNull(entityName, "Entity name");
         checkNotNull(primaryKey, "Primary key");
         checkSession();
 
+        String entityName = cls.getName();
+
         if (!verCfg.getEntCfg().isVersioned(entityName)) {
             throw new NotAuditedException(entityName, entityName + " is not versioned!");
         }
 
-        return createQuery().forRevisionsOfEntity(cls, entityName, false, true)
+        return createQuery().forRevisionsOfEntity(cls, false, true)
                 .addProjection(AuditEntity.revisionNumber())
                 .add(AuditEntity.id().eq(primaryKey))
                 .getResultList();
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/synchronization/AuditProcessManager.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/synchronization/AuditProcessManager.java
@@ -52,22 +52,10 @@ public class AuditProcessManager {
         AuditProcess auditProcess = auditProcesses.get(transaction);
         if (auditProcess == null) {
             // No worries about registering a transaction twice - a transaction is single thread
-            auditProcess = new AuditProcess(revisionInfoGenerator, session);
+            auditProcess = new AuditProcess(revisionInfoGenerator);
             auditProcesses.put(transaction, auditProcess);
 
-            /*
-             * HHH-5315: the process must be both a BeforeTransactionCompletionProcess and a TX Synchronization.
-             *
-             * In a resource-local tx env, the process is called after the flush, and populates the audit tables.
-             * Also, any exceptions that occur during that are propagated (if a Synchronization was used, the exceptions
-             * would be eaten).
-             *
-             * In a JTA env, the before transaction completion is called before the flush, so not all changes are yet
-             * written. However, Synchronization-s do propagate exceptions, so they can be safely used. 
-             */
             session.getActionQueue().registerProcess(auditProcess);
-            session.getTransaction().registerSynchronization(auditProcess);
-
             session.getActionQueue().registerProcess(new AfterTransactionCompletionProcess() {
                 public void doAfterTransactionCompletion(boolean success, SessionImplementor session) {
                     auditProcesses.remove(transaction);
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/synchronization/AuditProcess.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/synchronization/AuditProcess.java
@@ -37,14 +37,11 @@ import org.hibernate.envers.tools.Pair;
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
 
-import javax.transaction.Synchronization;
-
 /**
  * @author Adam Warski (adam at warski dot org)
  */
-public class AuditProcess implements BeforeTransactionCompletionProcess, Synchronization {
+public class AuditProcess implements BeforeTransactionCompletionProcess {
     private final RevisionInfoGenerator revisionInfoGenerator;
-    private final SessionImplementor session;
 
     private final LinkedList<AuditWorkUnit> workUnits;
     private final Queue<AuditWorkUnit> undoQueue;
@@ -52,9 +49,8 @@ public class AuditProcess implements Bef
 
     private Object revisionData;
 
-    public AuditProcess(RevisionInfoGenerator revisionInfoGenerator, SessionImplementor session) {
+    public AuditProcess(RevisionInfoGenerator revisionInfoGenerator) {
         this.revisionInfoGenerator = revisionInfoGenerator;
-        this.session = session;
 
         workUnits = new LinkedList<AuditWorkUnit>();
         undoQueue = new LinkedList<AuditWorkUnit>();
@@ -157,12 +153,4 @@ public class AuditProcess implements Bef
             session.flush();
         }
     }
-
-    // Synchronization methods
-
-    public void beforeCompletion() {
-        doBeforeTransactionCompletion(session);
-    }
-
-    public void afterCompletion(int status) { }
 }
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/tools/Tools.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/tools/Tools.java
@@ -32,7 +32,6 @@ import java.util.*;
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class Tools {
     public static <K,V> Map<K,V> newHashMap() {
@@ -47,14 +46,14 @@ public class Tools {
         return new LinkedHashMap<K,V>();
     }
 
-	public static boolean entitiesEqual(SessionImplementor session, String entityName, Object obj1, Object obj2) {
-        Object id1 = getIdentifier(session, entityName, obj1);
-		Object id2 = getIdentifier(session, entityName, obj2);
+	public static boolean entitiesEqual(SessionImplementor session, Object obj1, Object obj2) {
+        Object id1 = getIdentifier(session, obj1);
+		Object id2 = getIdentifier(session, obj2);
 
         return objectsEqual(id1, id2);
-    }	
+    }
 
-	public static Object getIdentifier(SessionImplementor session, String entityName, Object obj) {
+	public static Object getIdentifier(SessionImplementor session, Object obj) {
 		if (obj == null) {
 			return null;
 		}
@@ -64,9 +63,9 @@ public class Tools {
 			return hibernateProxy.getHibernateLazyInitializer().getIdentifier();
 		}
 
-		return session.getEntityPersister(entityName, obj).getIdentifier(obj, session);
-	}	    
 
+		return session.getEntityPersister( null, obj ).getIdentifier( obj, session );
+	}
 
     public static Object getTargetFromProxy(SessionFactoryImplementor sessionFactoryImplementor, HibernateProxy proxy) {
         if (!proxy.getHibernateLazyInitializer().isUninitialized()) {
--- libhibernate3-java-3.5.4.Final.orig/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java
+++ libhibernate3-java-3.5.4.Final/envers/src/main/java/org/hibernate/envers/event/AuditEventListener.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.util.List;
 
 import org.hibernate.envers.configuration.AuditConfiguration;
-import org.hibernate.envers.entities.EntityConfiguration;
 import org.hibernate.envers.entities.RelationDescription;
 import org.hibernate.envers.entities.RelationType;
 import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData;
@@ -61,7 +60,6 @@ import org.hibernate.proxy.HibernateProx
 
 /**
  * @author Adam Warski (adam at warski dot org)
- * @author Hernn Chanfreau
  */
 public class AuditEventListener implements PostInsertEventListener, PostUpdateEventListener,
         PostDeleteEventListener, PreCollectionUpdateEventListener, PreCollectionRemoveEventListener,
@@ -92,7 +90,7 @@ public class AuditEventListener implemen
                 Object oldValue = oldState == null ? null : oldState[i];
                 Object newValue = newState == null ? null : newState[i];
 
-                if (!Tools.entitiesEqual(session, relDesc.getToEntityName(), oldValue, newValue)) {
+                if (!Tools.entitiesEqual(session, oldValue, newValue)) {
                     // We have to generate changes both in the old collection (size decreses) and new collection
                     // (size increases).
                     if (newValue != null) {
@@ -266,7 +264,7 @@ public class AuditEventListener implemen
 
             // Checking if this is not a "fake" many-to-one bidirectional relation. The relation description may be
             // null in case of collections of non-entities.
-            RelationDescription rd = searchForRelationDescription(entityName, referencingPropertyName);
+            RelationDescription rd = verCfg.getEntCfg().get(entityName).getRelationDescription(referencingPropertyName);
             if (rd != null && rd.getMappedByPropertyName() != null) {
                 generateFakeBidirecationalRelationWorkUnits(auditProcess, newColl, oldColl, entityName,
                         referencingPropertyName, event, rd);
@@ -287,24 +285,6 @@ public class AuditEventListener implemen
         }
     }
 
-    /**
-     * Looks up a relation description corresponding to the given property in the given entity. If no description is
-     * found in the given entity, the parent entity is checked (so that inherited relations work).
-     * @param entityName Name of the entity, in which to start looking.
-     * @param referencingPropertyName The name of the property.
-     * @return A found relation description corresponding to the given entity or {@code null}, if no description can
-     * be found.
-     */
-    private RelationDescription searchForRelationDescription(String entityName, String referencingPropertyName) {
-        EntityConfiguration configuration = verCfg.getEntCfg().get(entityName);
-        RelationDescription rd = configuration.getRelationDescription(referencingPropertyName);
-        if (rd == null && configuration.getParentEntityName() != null) {
-            return searchForRelationDescription(configuration.getParentEntityName(), referencingPropertyName);
-        }
-
-        return rd;
-    }
-
     private CollectionEntry getCollectionEntry(AbstractCollectionEvent event) {
         return event.getSession().getPersistenceContext().getCollectionEntry(event.getCollection());
     }
--- libhibernate3-java-3.5.4.Final.orig/cache-oscache/pom.xml
+++ libhibernate3-java-3.5.4.Final/cache-oscache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/distribution/pom.xml
+++ libhibernate3-java-3.5.4.Final/distribution/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/annotations/pom.xml
+++ libhibernate3-java-3.5.4.Final/annotations/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
@@ -34,7 +34,7 @@ import org.hibernate.test.annotations.Te
  * @author Steve Ebersole
  */
 public class ExplicitSqlResultSetMappingTest extends TestCase {
-	private String queryString = null;
+	private String queryString = "select t.\"NAME\" as \"QuotEd_nAMe\" from \"MY_ENTITY_TABLE\" t";
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
@@ -47,9 +47,6 @@ public class ExplicitSqlResultSetMapping
 	}
 
 	private void prepareTestData() {
-		char open = getDialect().openQuote();
-		char close = getDialect().closeQuote();
-		queryString = "select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t";
 		Session s = sfi().openSession();
 		s.beginTransaction();
 		s.save( new MyEntity( "mine" ) );
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
@@ -1,34 +1,10 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. 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 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
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * 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
- */
+//$Id: IdTest.java 18704 2010-02-05 18:28:39Z steve.ebersole@jboss.com $
 package org.hibernate.test.annotations.id.sequences;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
 import org.hibernate.mapping.Column;
 import org.hibernate.test.annotations.TestCase;
 import org.hibernate.test.annotations.id.sequences.entities.Ball;
@@ -53,28 +29,27 @@ import org.hibernate.test.annotations.id
  * @author Emmanuel Bernard
  */
 @SuppressWarnings("unchecked")
-@RequiresDialectFeature(DialectChecks.SupportsSequences.class)
 public class IdTest extends TestCase {
 	public void testGenericGenerator() throws Exception {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		SoundSystem system = new SoundSystem();
-		system.setBrand( "Genelec" );
-		system.setModel( "T234" );
+		system.setBrand("Genelec");
+		system.setModel("T234");
 		Furniture fur = new Furniture();
-		s.persist( system );
-		s.persist( fur );
+		s.persist(system);
+		s.persist(fur);
 		tx.commit();
 		s.close();
 
 		s = openSession();
 		tx = s.beginTransaction();
-		system = ( SoundSystem ) s.get( SoundSystem.class, system.getId() );
-		fur = ( Furniture ) s.get( Furniture.class, fur.getId() );
-		assertNotNull( system );
-		assertNotNull( fur );
-		s.delete( system );
-		s.delete( fur );
+		system = (SoundSystem) s.get(SoundSystem.class, system.getId());
+		fur = (Furniture) s.get(Furniture.class, fur.getId());
+		assertNotNull(system);
+		assertNotNull(fur);
+		s.delete(system);
+		s.delete(fur);
 		tx.commit();
 		s.close();
 
@@ -84,14 +59,13 @@ public class IdTest extends TestCase {
 	 * Ensures that GenericGenerator annotations wrapped inside a
 	 * GenericGenerators holder are bound correctly
 	 */
-
 	public void testGenericGenerators() throws Exception {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		Monkey monkey = new Monkey();
-		s.persist( monkey );
+		s.persist(monkey);
 		s.flush();
-		assertNotNull( monkey.getId() );
+		assertNotNull(monkey.getId());
 		tx.rollback();
 		s.close();
 	}
@@ -103,23 +77,21 @@ public class IdTest extends TestCase {
 		Ball b = new Ball();
 		Dog d = new Dog();
 		Computer c = new Computer();
-		s.persist( b );
-		s.persist( d );
-		s.persist( c );
+		s.persist(b);
+		s.persist(d);
+		s.persist(c);
 		tx.commit();
 		s.close();
-		assertEquals( "table id not generated", new Integer( 1 ), b.getId() );
-		assertEquals(
-				"generator should not be shared", new Integer( 1 ), d
-						.getId()
-		);
-		assertEquals( "default value should work", new Long( 1 ), c.getId() );
+		assertEquals("table id not generated", new Integer(1), b.getId());
+		assertEquals("generator should not be shared", new Integer(1), d
+				.getId());
+		assertEquals("default value should work", new Long(1), c.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		s.delete( s.get( Ball.class, new Integer( 1 ) ) );
-		s.delete( s.get( Dog.class, new Integer( 1 ) ) );
-		s.delete( s.get( Computer.class, new Long( 1 ) ) );
+		s.delete(s.get(Ball.class, new Integer(1)));
+		s.delete(s.get(Dog.class, new Integer(1)));
+		s.delete(s.get(Computer.class, new Long(1)));
 		tx.commit();
 		s.close();
 	}
@@ -128,14 +100,14 @@ public class IdTest extends TestCase {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		Shoe b = new Shoe();
-		s.persist( b );
+		s.persist(b);
 		tx.commit();
 		s.close();
-		assertNotNull( b.getId() );
+		assertNotNull(b.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		s.delete( s.get( Shoe.class, b.getId() ) );
+		s.delete(s.get(Shoe.class, b.getId()));
 		tx.commit();
 		s.close();
 	}
@@ -144,14 +116,14 @@ public class IdTest extends TestCase {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		Store b = new Store();
-		s.persist( b );
+		s.persist(b);
 		tx.commit();
 		s.close();
-		assertNotNull( b.getId() );
+		assertNotNull(b.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		s.delete( s.get( Store.class, b.getId() ) );
+		s.delete(s.get(Store.class, b.getId()));
 		tx.commit();
 		s.close();
 	}
@@ -160,14 +132,14 @@ public class IdTest extends TestCase {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
 		Department b = new Department();
-		s.persist( b );
+		s.persist(b);
 		tx.commit();
 		s.close();
-		assertNotNull( b.getId() );
+		assertNotNull(b.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		s.delete( s.get( Department.class, b.getId() ) );
+		s.delete(s.get(Department.class, b.getId()));
 		tx.commit();
 		s.close();
 	}
@@ -178,16 +150,16 @@ public class IdTest extends TestCase {
 		s = openSession();
 		tx = s.beginTransaction();
 		Home h = new Home();
-		s.persist( h );
+		s.persist(h);
 		tx.commit();
 		s.close();
-		assertNotNull( h.getId() );
+		assertNotNull(h.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		Home reloadedHome = ( Home ) s.get( Home.class, h.getId() );
-		assertEquals( h.getId(), reloadedHome.getId() );
-		s.delete( reloadedHome );
+		Home reloadedHome = (Home) s.get(Home.class, h.getId());
+		assertEquals(h.getId(), reloadedHome.getId());
+		s.delete(reloadedHome);
 		tx.commit();
 		s.close();
 	}
@@ -198,16 +170,16 @@ public class IdTest extends TestCase {
 		s = openSession();
 		tx = s.beginTransaction();
 		Home h = new Home();
-		s.persist( h );
+		s.persist(h);
 		tx.commit();
 		s.close();
-		assertNotNull( h.getId() );
+		assertNotNull(h.getId());
 
 		s = openSession();
 		tx = s.beginTransaction();
-		Home reloadedHome = ( Home ) s.get( Home.class, h.getId() );
-		assertEquals( h.getId(), reloadedHome.getId() );
-		s.delete( reloadedHome );
+		Home reloadedHome = (Home) s.get(Home.class, h.getId());
+		assertEquals(h.getId(), reloadedHome.getId());
+		s.delete(reloadedHome);
 		tx.commit();
 		s.close();
 	}
@@ -218,13 +190,13 @@ public class IdTest extends TestCase {
 		s = openSession();
 		tx = s.beginTransaction();
 		FirTree chrismasTree = new FirTree();
-		s.persist( chrismasTree );
+		s.persist(chrismasTree);
 		tx.commit();
 		s.clear();
 		tx = s.beginTransaction();
-		chrismasTree = ( FirTree ) s.get( FirTree.class, chrismasTree.getId() );
-		assertNotNull( chrismasTree );
-		s.delete( chrismasTree );
+		chrismasTree = (FirTree) s.get(FirTree.class, chrismasTree.getId());
+		assertNotNull(chrismasTree);
+		s.delete(chrismasTree);
 		tx.commit();
 		s.close();
 	}
@@ -234,58 +206,55 @@ public class IdTest extends TestCase {
 		Transaction tx;
 		s = openSession();
 		tx = s.beginTransaction();
-		Footballer fb = new Footballer( "David", "Beckam", "Arsenal" );
-		GoalKeeper keeper = new GoalKeeper( "Fabien", "Bartez", "OM" );
-		s.persist( fb );
-		s.persist( keeper );
+		Footballer fb = new Footballer("David", "Beckam", "Arsenal");
+		GoalKeeper keeper = new GoalKeeper("Fabien", "Bartez", "OM");
+		s.persist(fb);
+		s.persist(keeper);
 		tx.commit();
 		s.clear();
 
 		// lookup by id
 		tx = s.beginTransaction();
-		FootballerPk fpk = new FootballerPk( "David", "Beckam" );
-		fb = ( Footballer ) s.get( Footballer.class, fpk );
-		FootballerPk fpk2 = new FootballerPk( "Fabien", "Bartez" );
-		keeper = ( GoalKeeper ) s.get( GoalKeeper.class, fpk2 );
-		assertNotNull( fb );
-		assertNotNull( keeper );
-		assertEquals( "Beckam", fb.getLastname() );
-		assertEquals( "Arsenal", fb.getClub() );
-		assertEquals(
-				1, s.createQuery(
-						"from Footballer f where f.firstname = 'David'"
-				).list().size()
-		);
+		FootballerPk fpk = new FootballerPk("David", "Beckam");
+		fb = (Footballer) s.get(Footballer.class, fpk);
+		FootballerPk fpk2 = new FootballerPk("Fabien", "Bartez");
+		keeper = (GoalKeeper) s.get(GoalKeeper.class, fpk2);
+		assertNotNull(fb);
+		assertNotNull(keeper);
+		assertEquals("Beckam", fb.getLastname());
+		assertEquals("Arsenal", fb.getClub());
+		assertEquals(1, s.createQuery(
+				"from Footballer f where f.firstname = 'David'").list().size());
 		tx.commit();
 
 		// reattach by merge
 		tx = s.beginTransaction();
-		fb.setClub( "Bimbo FC" );
-		s.merge( fb );
+		fb.setClub("Bimbo FC");
+		s.merge(fb);
 		tx.commit();
 
 		// reattach by saveOrUpdate
 		tx = s.beginTransaction();
-		fb.setClub( "Bimbo FC SA" );
-		s.saveOrUpdate( fb );
+		fb.setClub("Bimbo FC SA");
+		s.saveOrUpdate(fb);
 		tx.commit();
 
 		// clean up
 		s.clear();
 		tx = s.beginTransaction();
-		fpk = new FootballerPk( "David", "Beckam" );
-		fb = ( Footballer ) s.get( Footballer.class, fpk );
-		assertEquals( "Bimbo FC SA", fb.getClub() );
-		s.delete( fb );
-		s.delete( keeper );
+		fpk = new FootballerPk("David", "Beckam");
+		fb = (Footballer) s.get(Footballer.class, fpk);
+		assertEquals("Bimbo FC SA", fb.getClub());
+		s.delete(fb);
+		s.delete(keeper);
 		tx.commit();
 		s.close();
 	}
 
 	public void testColumnDefinition() {
-		Column idCol = ( Column ) getCfg().getClassMapping( Ball.class.getName() )
+		Column idCol = (Column) getCfg().getClassMapping(Ball.class.getName())
 				.getIdentifierProperty().getValue().getColumnIterator().next();
-		assertEquals( "ball_id", idCol.getName() );
+		assertEquals("ball_id", idCol.getName());
 	}
 
 	public void testLowAllocationSize() throws Exception {
@@ -295,39 +264,42 @@ public class IdTest extends TestCase {
 		tx = s.beginTransaction();
 		int size = 4;
 		BreakDance[] bds = new BreakDance[size];
-		for ( int i = 0; i < size; i++ ) {
+		for (int i = 0; i < size; i++) {
 			bds[i] = new BreakDance();
-			s.persist( bds[i] );
+			s.persist(bds[i]);
 		}
 		s.flush();
-		for ( int i = 0; i < size; i++ ) {
-			assertEquals( i + 1, bds[i].id.intValue() );
+		for (int i = 0; i < size; i++) {
+			assertEquals(i + 1, bds[i].id.intValue());
 		}
 		tx.rollback();
 		s.close();
 	}
+	
+	
+	
+	@Override
+	protected boolean runForCurrentDialect() {
+		return super.runForCurrentDialect() && getDialect().supportsSequences();
+	}
 
 	/**
 	 * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
 	 */
 	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
-				Ball.class, Shoe.class, Store.class,
+		return new Class[] { Ball.class, Shoe.class, Store.class,
 				Department.class, Dog.class, Computer.class, Home.class,
 				Phone.class, Tree.class, FirTree.class, Footballer.class,
 				SoundSystem.class, Furniture.class, GoalKeeper.class,
-				BreakDance.class, Monkey.class
-		};
+				BreakDance.class, Monkey.class};
 	}
-
+	
 	/**
 	 * @see org.hibernate.test.annotations.TestCase#getAnnotatedPackages()
 	 */
 	protected String[] getAnnotatedPackages() {
-		return new String[] {
-				"org.hibernate.test.annotations",
-				"org.hibernate.test.annotations.id"
-		};
+		return new String[] { "org.hibernate.test.annotations",
+				"org.hibernate.test.annotations.id" };
 	}
 
 	@Override
@@ -339,4 +311,5 @@ public class IdTest extends TestCase {
 	protected void configure(Configuration cfg) {
 		cfg.setProperty( AnnotationConfiguration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
 	}
+
 }
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
@@ -1,5 +1,5 @@
-//$Id: ManyToManyTest.java 19744 2010-06-15 20:50:02Z gbadner $
-//$Id: ManyToManyTest.java 19744 2010-06-15 20:50:02Z gbadner $
+//$Id: ManyToManyTest.java 19311 2010-04-27 23:55:49Z gbadner $
+//$Id: ManyToManyTest.java 19311 2010-04-27 23:55:49Z gbadner $
 package org.hibernate.test.annotations.manytomany;
 
 
@@ -99,11 +99,9 @@ public class ManyToManyTest extends Test
 		s.close();
 
 		s = openSession();
-		tx = s.beginTransaction();
 		List result = s.createCriteria( Supplier.class ).createAlias( "suppStores", "s" ).add(
 				Restrictions.eq( "s.name", "Fnac" ) ).list();
 		assertEquals( 1, result.size() );
-		tx.commit();
 		s.close();
 	}
 	public void testDefaultCompositePk() throws Exception {
@@ -773,4 +771,4 @@ public class ManyToManyTest extends Test
 		};
 	}
 
-}
+}
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
@@ -1,9 +1,7 @@
-//$Id: JoinedSubclassTest.java 19907 2010-07-07 13:39:12Z sharathjreddy $
+//$Id: JoinedSubclassTest.java 18602 2010-01-21 20:48:59Z hardy.ferentschik $
 package org.hibernate.test.annotations.inheritance.joined;
 
-import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -124,80 +122,6 @@ public class JoinedSubclassTest extends
 		transaction.commit();
 		session.close();
 	}
-	
-	//HHH-4250 : @ManyToOne - @OneToMany doesn't work with @Inheritance(strategy= InheritanceType.JOINED)
-	public void testManyToOneWithJoinTable() {
-
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-				
-		Client c1 = new Client();
-		c1.setFirstname("Firstname1");
-		c1.setName("Name1");
-		c1.setCode("1234");
-		c1.setStreet("Street1");
-		c1.setCity("City1");
-		
-		Account a1 = new Account();
-		a1.setNumber("1000");
-		a1.setBalance(5000.0);
-		
-		a1.addClient(c1);
-		
-		s.persist(c1);
-		s.persist(a1);
-	    
-		s.flush();
-		s.clear();
-		
-		c1 = (Client) s.load(Client.class, c1.getId());
-		assertEquals(5000.0, c1.getAccount().getBalance());
-		
-		s.flush();
-		s.clear();
-		
-		a1 = (Account) s.load(Account.class,a1.getId());
-		Set<Client> clients = a1.getClients();
-		assertEquals(1, clients.size());
-		Iterator<Client> it = clients.iterator();
-		c1 = it.next();
-		assertEquals("Name1", c1.getName());
-				
-		tx.rollback();
-		s.close();
-	}
-	
-	/**
-     *   HHH-4240 - SecondaryTables not recognized when using JOINED inheritance
-	 */	
-	public void testSecondaryTables() {
-		
-		Session s = openSession();
-		s.getTransaction().begin();
-		
-		Company company = new Company();
-		company.setCustomerName("Mama");
-		company.setCustomerCode("123");
-		company.setCompanyName("Mama Mia Pizza");
-		company.setCompanyAddress("Rome");
-		
-		s.persist( company );
-		s.getTransaction().commit();
-		s.clear();
-		
-		s = openSession();
-		s.getTransaction().begin();
-		company = (Company) s.get( Company.class, company.getId());
-		assertEquals("Mama", company.getCustomerName());
-		assertEquals("123", company.getCustomerCode());
-		assertEquals("Mama Mia Pizza", company.getCompanyName());
-		assertEquals("Rome", company.getCompanyAddress());
-				
-		s.delete( company );
-		s.getTransaction().commit();
-		s.close();
-	}
-	
 
 //	public void testManyToOneAndJoin() throws Exception {
 //		Session session = openSession();
@@ -244,10 +168,6 @@ public class JoinedSubclassTest extends
 				Sweater.class,
 				EventInformation.class,
 				Alarm.class,
-				Client.class,
-				Account.class,
-				Customer.class,
-				Company.class
 				//Asset.class,
 				//Parent.class,
 				//PropertyAsset.class,
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
@@ -1,38 +1,14 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. 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 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
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * 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
- */
+//$Id: LobTest.java 18602 2010-01-21 20:48:59Z hardy.ferentschik $
 package org.hibernate.test.annotations.lob;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.test.annotations.TestCase;
 
 /**
  * @author Emmanuel Bernard
  */
-@RequiresDialectFeature(DialectChecks.SupportsExpectedLobUsagePattern.class)
 public class LobTest extends TestCase {
 	public void testSerializableToBlob() throws Exception {
 		Book book = new Book();
@@ -142,6 +118,11 @@ public class LobTest extends TestCase {
 		super( x );
 	}
 
+	@Override
+	protected boolean runForCurrentDialect() {
+		return super.runForCurrentDialect() && getDialect().supportsExpectedLobUsagePattern();
+	}
+
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] {
 				Book.class,
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
@@ -1,31 +1,7 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. 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 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
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * 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
- */
+//$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
 package org.hibernate.test.annotations.xml.hbm;
 
 import org.hibernate.Session;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
 import org.hibernate.test.annotations.TestCase;
 
 /**
@@ -33,7 +9,6 @@ import org.hibernate.test.annotations.Te
  */
 public class HbmWithIdentityTest extends TestCase {
 
-	@RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
 	public void testManyToOneAndInterface() throws Exception {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -48,6 +23,11 @@ public class HbmWithIdentityTest extends
 		s.close();
 	}
 
+	@Override
+	protected boolean runForCurrentDialect() {
+		return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+	}
+
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] {
 				Sky.class,
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
@@ -1,4 +1,4 @@
-//$Id: Trainer.java 19767 2010-06-18 16:50:20Z epbernard $
+//$Id: Trainer.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.test.annotations.onetomany;
 
 import java.util.Set;
@@ -53,8 +53,7 @@ public class Trainer {
 	@OneToMany
 	@JoinTable(
 			name = "TrainedMonkeys",
-			//columns are optional, here we explicit them
-			joinColumns = @JoinColumn(name = "trainer_id"),
+			joinColumns = {@JoinColumn(name = "trainer_id")},
 			inverseJoinColumns = @JoinColumn(name = "monkey_id")
 	)
 	@ForeignKey(name = "TM_TRA_FK", inverseName = "TM_MON_FK")
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
@@ -1,4 +1,4 @@
-//$Id: OneToManyTest.java 19767 2010-06-18 16:50:20Z epbernard $
+//$Id: OneToManyTest.java 18869 2010-02-24 17:11:05Z hardy.ferentschik $
 package org.hibernate.test.annotations.onetomany;
 
 import java.util.ArrayList;
@@ -6,7 +6,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -173,28 +172,7 @@ public class OneToManyTest extends TestC
 		assertNotNull( trainer );
 		assertNotNull( trainer.getTrainedMonkeys() );
 		assertEquals( 2, trainer.getTrainedMonkeys().size() );
-
-		//test suppression of trainer wo monkey
-		final Set<Monkey> monkeySet = new HashSet( trainer.getTrainedMonkeys() );
-		s.delete( trainer );
-		s.flush();
-		tx.commit();
-
-		s.clear();
-
-		tx = s.beginTransaction();
-		for ( Monkey m : monkeySet ) {
-			final Object managedMonkey = s.get( Monkey.class, m.getId() );
-			assertNotNull( "No trainers but monkeys should still be here", managedMonkey );
-		}
-
-		//clean up
-		for ( Monkey m : monkeySet ) {
-			final Object managedMonkey = s.get( Monkey.class, m.getId() );
-			s.delete(managedMonkey);
-		}
-		s.flush();
-		tx.commit();
+		tx.rollback();
 		s.close();
 	}
 
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java
@@ -71,7 +71,7 @@ public class SubselectTest extends TestC
 		HighestBid highestBid = (HighestBid) query.list().iterator().next();
 		
 		assertEquals(200.0, highestBid.getAmount());
-		s.getTransaction().rollback();
+		
 		s.close();	
 		
 		
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java
@@ -1,4 +1,4 @@
-//$Id: BackquoteTest.java 19883 2010-07-01 11:26:39Z sharathjreddy $
+//$Id: BackquoteTest.java 14747 2008-06-06 08:16:25Z hardy.ferentschik $
 package org.hibernate.test.annotations.backquotes;
 
 import java.io.PrintWriter;
@@ -6,7 +6,6 @@ import java.io.StringWriter;
 
 import junit.framework.TestCase;
 
-import org.hibernate.MappingException;
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,33 +34,4 @@ public class BackquoteTest extends TestC
 			fail(e.getMessage());
 		}
 	}
-	
-	/** 
-	 *  HHH-4647 : Problems with @JoinColumn referencedColumnName and quoted column and table names
-	 *  
-	 *  An invalid referencedColumnName to an entity having a quoted table name results in an 
-	 *  infinite loop in o.h.c.Configuration$MappingsImpl#getPhysicalColumnName(). 
-	 *  The same issue exists with getLogicalColumnName()
-	 */
-	public void testInvalidReferenceToQuotedTableName() {
-    	try {
-    		AnnotationConfiguration config = new AnnotationConfiguration();
-    		config.addAnnotatedClass(Printer.class);
-    		config.addAnnotatedClass(PrinterCable.class);
-    		config.buildSessionFactory();
-    		fail("expected MappingException to be thrown");
-    	}
-    	//we WANT MappingException to be thrown
-        catch( MappingException e ) { 
-        	assertTrue("MappingException was thrown", true); 
-        }
-        catch(Exception e) {
-        	StringWriter writer = new StringWriter();
-			e.printStackTrace(new PrintWriter(writer));
-			log.debug(writer.toString());
-        	fail(e.getMessage());
-        }
-	}
-
-	
 }
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java
@@ -40,7 +40,7 @@ public class IntermediateMappedSuperclas
 	}
 
 	public void testGetOnIntermediateMappedSuperclass() {
-		final BigDecimal withdrawalLimit = new BigDecimal( 1000 ).setScale( 2 );
+		final BigDecimal withdrawalLimit = new BigDecimal( 1000 );
 		Session session = openSession();
 		session.beginTransaction();
 		SavingsAccount savingsAccount = new SavingsAccount( "123", withdrawalLimit );
@@ -50,8 +50,8 @@ public class IntermediateMappedSuperclas
 
 		session = openSession();
 		session.beginTransaction();
-		Account account = ( Account ) session.get( Account.class, savingsAccount.getId() );
-		assertEquals( withdrawalLimit, ( ( SavingsAccount ) account ).getWithdrawalLimit() );
+		Account account = (Account) session.get( Account.class, savingsAccount.getId() );
+		assertEquals( withdrawalLimit, ( (SavingsAccount) account ).getWithdrawalLimit() );
 		session.delete( account );
 		session.getTransaction().commit();
 		session.close();
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java
@@ -1,22 +1,19 @@
 package org.hibernate.test.annotations.beanvalidation;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.BigDecimal;
 import java.util.Date;
-import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.validation.Valid;
+import javax.persistence.Embeddable;
 import javax.validation.constraints.Future;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+import javax.validation.Valid;
 
 /**
  * @author Emmanuel Bernard
- * @author Hardy Ferentschik
  */
 @Entity
 public class Tv {
@@ -24,28 +21,17 @@ public class Tv {
 	@Id
 	@Size(max = 2)
 	public String serial;
-
-	@Length(max=5)
-	public String model;
-
 	public int size;
-
 	@Size(max = 2)
 	public String name;
-
 	@Future
 	public Date expDate;
-
 	@Size(min = 0)
 	public String description;
-
 	@Min(1000)
 	public BigInteger lifetime;
-
-	@NotNull
-	@Valid
+	@NotNull @Valid
 	public Tuner tuner;
-
 	@Valid
 	public Recorder recorder;
 
@@ -60,4 +46,5 @@ public class Tv {
 		@NotNull
 		public BigDecimal time;
 	}
+
 }
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
@@ -6,15 +6,13 @@ import org.hibernate.mapping.Property;
 import org.hibernate.test.annotations.TestCase;
 
 /**
- * Test verifying that DDL constraints get applied when Bean Validation / Hibernate Validator are enabled.
- *
  * @author Emmanuel Bernard
- * @author Hardy Ferentschik
  */
 public class DDLTest extends TestCase {
 
 	public void testBasicDDL() {
 		PersistentClass classMapping = getCfg().getClassMapping( Address.class.getName() );
+		//new ClassValidator( Address.class, ResourceBundle.getBundle("messages", Locale.ENGLISH) ).apply( classMapping );
 		Column stateColumn = (Column) classMapping.getProperty( "state" ).getColumnIterator().next();
 		assertEquals( stateColumn.getLength(), 3 );
 		Column zipColumn = (Column) classMapping.getProperty( "zip" ).getColumnIterator().next();
@@ -25,20 +23,9 @@ public class DDLTest extends TestCase {
 	public void testApplyOnIdColumn() throws Exception {
 		PersistentClass classMapping = getCfg().getClassMapping( Tv.class.getName() );
 		Column serialColumn = (Column) classMapping.getIdentifierProperty().getColumnIterator().next();
-		assertEquals( "Validator annotation not applied on ids", 2, serialColumn.getLength() );
+		assertEquals( "Vaidator annotation not applied on ids", 2, serialColumn.getLength() );
 	}
 
-	/**
-	 * HHH-5281
-	 *
-	 * @throws Exception in case the test fails
-	 */
-	public void testLengthConstraint() throws Exception {
-		PersistentClass classMapping = getCfg().getClassMapping( Tv.class.getName() );
-		Column modelColumn = (Column) classMapping.getProperty( "model" ).getColumnIterator().next();
-		assertEquals( modelColumn.getLength(), 5 );
-	}	
-
 	public void testApplyOnManyToOne() throws Exception {
 		PersistentClass classMapping = getCfg().getClassMapping( TvOwner.class.getName() );
 		Column serialColumn = (Column) classMapping.getProperty( "tv" ).getColumnIterator().next();
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java
@@ -3,10 +3,8 @@ package org.hibernate.test.annotations.b
 import java.math.BigDecimal;
 import javax.validation.ConstraintViolationException;
 
-import org.hibernate.mapping.PersistentClass;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.mapping.Column;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.test.annotations.TestCase;
 
@@ -29,12 +27,6 @@ public class BeanValidationDisabledTest
 		tx.rollback();
 		s.close();
 	}
-	
-	public void testDDLDisabled() {
-		PersistentClass classMapping = getCfg().getClassMapping( Address.class.getName() ); 		
-		Column countryColumn = (Column) classMapping.getProperty( "country" ).getColumnIterator().next(); 	
-		assertTrue("DDL constraints are applied", countryColumn.isNullable() ); 	
-	}
 
 	@Override
 	protected void configure(Configuration cfg) {
@@ -44,8 +36,7 @@ public class BeanValidationDisabledTest
 
 	protected Class<?>[] getAnnotatedClasses() {
 		return new Class<?>[] {
-				Address.class,
 				CupHolder.class
 		};
 	}
-}
+}
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
@@ -1,54 +1,29 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat Inc. 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 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
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * 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.annotations.manytoone.referencedcolumnname;
 
 import java.math.BigDecimal;
 
-import org.hibernate.Session;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
 import org.hibernate.test.annotations.TestCase;
+import org.hibernate.Session;
 
 /**
  * @author Emmanuel Bernard
  */
 public class ManyToOneReferencedColumnNameTest extends TestCase {
-	@RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
 	public void testReoverableExceptionInFkOrdering() throws Exception {
 		//SF should not blow up
 		Vendor v = new Vendor();
 		Item i = new Item();
 		ZItemCost ic = new ZItemCost();
-		ic.setCost( new BigDecimal( 2 ) );
+		ic.setCost( new BigDecimal(2) );
 		ic.setItem( i );
 		ic.setVendor( v );
 		WarehouseItem wi = new WarehouseItem();
 		wi.setDefaultCost( ic );
 		wi.setItem( i );
 		wi.setVendor( v );
-		wi.setQtyInStock( new BigDecimal( 2 ) );
-		Session s = openSession();
+		wi.setQtyInStock( new BigDecimal(2) );
+		Session s = openSession(  );
 		s.getTransaction().begin();
 		s.save( i );
 		s.save( v );
@@ -57,7 +32,15 @@ public class ManyToOneReferencedColumnNa
 		s.flush();
 		s.getTransaction().rollback();
 		s.close();
+		
 	}
+	
+	@Override
+	protected boolean runForCurrentDialect() {
+		return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+	}
+
+
 
 	protected Class[] getAnnotatedClasses() {
 		return new Class[] {
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
@@ -1,9 +1,8 @@
-//$Id: OneToOneTest.java 19881 2010-07-01 11:09:45Z sharathjreddy $
+//$Id: OneToOneTest.java 18870 2010-02-24 18:45:11Z hardy.ferentschik $
 package org.hibernate.test.annotations.onetoone;
 
 import java.util.Iterator;
 
-import org.hibernate.EmptyInterceptor;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -176,6 +175,7 @@ public class OneToOneTest extends TestCa
 		party.partyAffiliate = affiliate;
 		affiliate.party = party;
 		s.persist( party );
+		s.persist( affiliate );
 		s.getTransaction().commit();
 
 		s.clear();
@@ -270,40 +270,6 @@ public class OneToOneTest extends TestCa
 				"The mapping defines join columns which could not be found in the metadata.", fooFound && barFound
 		);
 	}
-	
-	/**
-	 * HHH-5109 @OneToOne - too many joins
-	 * This test uses an interceptor to verify that correct number of joins
-	 * are generated. 
-	 */
-	public void testPkOneToOneSelectStatementDoesNotGenerateExtraJoin() {
-			
-		Session s = openSession(new JoinCounter(1));
-		Transaction tx = s.beginTransaction();
-		Owner owner = new Owner();
-		OwnerAddress address = new OwnerAddress();
-		owner.setAddress( address );
-		address.setOwner( owner );
-		s.persist( owner );
-		s.flush();
-		s.clear();
-		
-		owner = ( Owner ) s.get( Owner.class, owner.getId() );
-		assertNotNull( owner );
-		assertNotNull( owner.getAddress() );
-		assertEquals( owner.getId(), owner.getAddress().getId() );
-		s.flush();
-		s.clear();
-		
-		address = ( OwnerAddress ) s.get( OwnerAddress.class, address.getId() );
-		assertNotNull( address );
-		assertNotNull( address.getOwner() );
-		assertEquals( address.getId(), address.getOwner().getId() );
-		
-		tx.rollback();
-		s.close();
-	}
-	
 
 	/**
 	 * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
@@ -333,55 +299,3 @@ public class OneToOneTest extends TestCa
 		return new String[] { "org/hibernate/test/annotations/onetoone/orm.xml" };
 	}
 }
-
-
-/**
- * Verifies that generated 'select' statement has desired number of joins 
- * @author Sharath Reddy
- *
- */
-class JoinCounter extends EmptyInterceptor {
-	 
-	private static final long serialVersionUID = -3689681272273261051L;
-	
-	private int expectedNumberOfJoins = 0;
-			
-	public JoinCounter(int val) {
-		super();
-		this.expectedNumberOfJoins = val;
-	}
-
-	public String onPrepareStatement(String sql) {
-				
-		int numberOfJoins = 0;
-		if (sql.startsWith("select")) {
-			 numberOfJoins = count(sql, "join");
-			 TestCase.assertEquals(expectedNumberOfJoins, numberOfJoins);
-		}
-						
-		return sql;
-	 }
-	
-	 /**
-	   * Count the number of instances of substring within a string.
-	   *
-	   * @param string     String to look for substring in.
-	   * @param substring  Sub-string to look for.
-	   * @return           Count of substrings in string.
-	   */
-	  private int count(final String string, final String substring)
-	  {
-	     int count = 0;
-	     int idx = 0;
-
-	     while ((idx = string.indexOf(substring, idx)) != -1)
-	     {
-	        idx++;
-	        count++;
-	     }
-
-	     return count;
-	  }
-	
-}
-
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Party.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/onetoone/Party.java
@@ -1,7 +1,6 @@
-//$Id: Party.java 19881 2010-07-01 11:09:45Z sharathjreddy $
+//$Id: Party.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.test.annotations.onetoone;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
@@ -15,7 +14,7 @@ public class Party {
 	@Id
 	String partyId;
 
-	@OneToOne(cascade=CascadeType.ALL)
+	@OneToOne
 	@PrimaryKeyJoinColumn
 	PartyAffiliate partyAffiliate;
 }
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
@@ -1,4 +1,4 @@
-//$Id: OwnerAddress.java 19881 2010-07-01 11:09:45Z sharathjreddy $
+//$Id: OwnerAddress.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $
 package org.hibernate.test.annotations.onetoone;
 
 import javax.persistence.Entity;
@@ -18,7 +18,7 @@ public class OwnerAddress {
 	@GenericGenerator(strategy = "foreign", name = "fk", parameters = @Parameter(name="property", value="owner"))
 	private Integer id;
 
-	@OneToOne(mappedBy="address")
+	@OneToOne(mappedBy="address", optional = false)
 	private Owner owner;
 
 	public Integer getId() {
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java
@@ -24,7 +24,7 @@
 package org.hibernate.annotations;
 
 /**
- * Type of available polymorphism for a particular entity
+ * Type of avaliable polymorphism for a particular entity
  *
  * @author Emmanuel Bernard
  */
@@ -34,7 +34,7 @@ public enum PolymorphismType {
 	 */
 	IMPLICIT,
 	/**
-	 * this entity is retrieved only if explicitly asked
+	 * this entity is retrived only if explicitly asked
 	 */
 	EXPLICIT
 }
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
@@ -1,4 +1,4 @@
-// $Id: AnnotationBinder.java 19881 2010-07-01 11:09:45Z sharathjreddy $
+// $Id: AnnotationBinder.java 19241 2010-04-16 10:11:32Z epbernard $
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
@@ -1563,9 +1563,7 @@ public final class AnnotationBinder {
 					}
 				}
 				//MapsId means the columns belong to the pk => not null
-				//@PKJC must be constrained
-		 	 	final boolean mandatory = !ann.optional() || forcePersist || trueOneToOne;
-				
+				final boolean mandatory = !ann.optional() || forcePersist;
 				bindOneToOne(
 						getCascadeStrategy( ann.cascade(), hibernateCascade, ann.orphanRemoval(), forcePersist ),
 						joinColumns,
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java
@@ -50,7 +50,7 @@ public class BeanValidationActivator {
 			properties.setProperty( Environment.CHECK_NULLABILITY, "false" );
 		}
 
-		if ( ! ( modes.contains( ValidationMode.CALLBACK ) || modes.contains( ValidationMode.AUTO ) ) ) return;
+		if ( modes.contains( ValidationMode.NONE ) ) return;
 
 		try {
 			Class<?> activator = ReflectHelper.classForName( TYPE_SAFE_ACTIVATOR_CLASS, BeanValidationActivator.class );
--- libhibernate3-java-3.5.4.Final.orig/annotations/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java
+++ libhibernate3-java-3.5.4.Final/annotations/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java
@@ -39,7 +39,6 @@ import org.hibernate.util.ReflectHelper;
 
 /**
  * @author Emmanuel Bernard
- * @author Hardy Ferentschik
  */
 class TypeSafeActivator {
 
@@ -149,17 +148,12 @@ class TypeSafeActivator {
 			if ( canApplyNotNull ) {
 				hasNotNull = hasNotNull || applyNotNull( property, descriptor );
 			}
-
-			// apply bean validation specific constraints
 			applyDigits( property, descriptor );
 			applySize( property, descriptor, propertyDesc );
 			applyMin( property, descriptor );
 			applyMax( property, descriptor );
 
-			// apply hibernate validator specific constraints - we cannot import any HV specific classes though!
-			applyLength( property, descriptor, propertyDesc );
-
-			// pass an empty set as composing constraints inherit the main constraint and thus are matching already
+			//pass an empty set as composing constraints inherit the main constraint and thus are matching already
 			hasNotNull = hasNotNull || applyConstraints(
 					descriptor.getComposingConstraints(),
 					property, propertyDesc, null,
@@ -219,28 +213,14 @@ class TypeSafeActivator {
 		}
 	}
 
-	private static void applySize(Property property, ConstraintDescriptor<?> descriptor, PropertyDescriptor propertyDescriptor) {
+	private static void applySize(Property property, ConstraintDescriptor<?> descriptor, PropertyDescriptor propertyDesc) {
 		if ( Size.class.equals( descriptor.getAnnotation().annotationType() )
-				&& String.class.equals( propertyDescriptor.getElementClass() ) ) {
-			@SuppressWarnings("unchecked")
-			ConstraintDescriptor<Size> sizeConstraint = ( ConstraintDescriptor<Size> ) descriptor;
+				&& String.class.equals( propertyDesc.getElementClass() ) ) {
+			@SuppressWarnings( "unchecked" )
+			ConstraintDescriptor<Size> sizeConstraint = (ConstraintDescriptor<Size>) descriptor;
 			int max = sizeConstraint.getAnnotation().max();
-			Column col = ( Column ) property.getColumnIterator().next();
-			if ( max < Integer.MAX_VALUE ) {
-				col.setLength( max );
-			}
-		}
-	}
-
-	private static void applyLength(Property property, ConstraintDescriptor<?> descriptor, PropertyDescriptor propertyDescriptor) {
-		if ( "org.hibernate.validator.constraints.Length".equals(descriptor.getAnnotation().annotationType().getName())
-			&& String.class.equals( propertyDescriptor.getElementClass() ) ) {
-			@SuppressWarnings("unchecked")
-			int max = (Integer) descriptor.getAttributes().get( "max" );
-			Column col = ( Column ) property.getColumnIterator().next();
-			if ( max < Integer.MAX_VALUE ) {
-				col.setLength( max );
-			}
+			Column col = (Column) property.getColumnIterator().next();
+			if ( max < Integer.MAX_VALUE ) col.setLength( max );
 		}
 	}
 
--- libhibernate3-java-3.5.4.Final.orig/cache-ehcache/pom.xml
+++ libhibernate3-java-3.5.4.Final/cache-ehcache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/testsuite/pom.xml
+++ libhibernate3-java-3.5.4.Final/testsuite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.4-Final</version>
+        <version>3.5.2-Final</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml
@@ -13,10 +13,10 @@
 			<generator class="increment"/>
 		</id>
 		<property name="x">
-			<column name="xval" not-null="true" precision="25" scale="20" unique-key="xy"/>
+			<column name="xval" not-null="true" length="4" unique-key="xy"/>
 		</property>
 		<property name="y">
-			<column name="yval" not-null="true" precision="25" scale="20" unique-key="xy"/>
+			<column name="yval" not-null="true" length="4" unique-key="xy"/>
 		</property>
 		<property name="description"/>
 	</class>
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
@@ -49,7 +49,6 @@ public class NativeSqlAndQuotedIdentifie
 
 	@Override
 	protected void prepareTest() throws Exception {
-		if(sfi() == null) return;
 		Session session = sfi().openSession();
 		session.beginTransaction();
 		session.save( new Person( "me" ) );
@@ -59,7 +58,6 @@ public class NativeSqlAndQuotedIdentifie
 
 	@Override
 	protected void cleanupTest() throws Exception {
-		if(sfi() == null) return;
 		Session session = sfi().openSession();
 		session.beginTransaction();
 		session.createQuery( "delete Person" ).executeUpdate();
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
@@ -4,7 +4,6 @@ package org.hibernate.test.hql;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Collections;
-import java.util.List;
 
 import junit.framework.Test;
 
@@ -34,12 +33,6 @@ public class CriteriaHQLAlignmentTest ex
 		SelectClause.VERSION2_SQL = true;
 	}
 
-	public String[] getMappings() {
-			return new String[] {
-					"hql/Animal.hbm.xml",
-			};
-	}
-
 	public boolean createSchema() {
 		return true; // needed for the Criteria return type test
 	}
@@ -126,7 +119,6 @@ public class CriteriaHQLAlignmentTest ex
 	// HHH-1724 Align Criteria with HQL aggregation return types.
 	public void testCriteriaAggregationReturnType() {
 		Session s = openSession();
-		s.beginTransaction();
 		Human human = new Human();
 		human.setBigIntegerValue( new BigInteger("42") );
 		human.setBigDecimalValue( new BigDecimal(45) );
@@ -180,7 +172,6 @@ public class CriteriaHQLAlignmentTest ex
 		
 		s.delete( human );
 		s.flush();
-		s.getTransaction().commit();
 		s.close();
 	}
 
@@ -233,24 +224,19 @@ public class CriteriaHQLAlignmentTest ex
 				.setProjection( Projections.count( "nickName" ).setDistinct() )
 				.uniqueResult();
 		assertEquals( 2, count.longValue() );
-		s.close();
+		s.clear();
 
 		s = openSession();
 		t = s.beginTransaction();
 		try {
 			count = ( Long ) s.createQuery( "select count( distinct name ) from Human" ).uniqueResult();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
 			assertEquals( 2, count.longValue() );
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleCounts() ) {
-				// expected
-			}
-			else {
-				throw ex;
-			}
+			// HSQLDB's cannot handle more than 1 argument in SELECT COUNT( DISTINCT ... ) )
+			if ( ! ( getDialect() instanceof HSQLDialect ) )  {
+				throw ex;
+			}
 		}
 		finally {
 			t.rollback();
@@ -263,18 +249,13 @@ public class CriteriaHQLAlignmentTest ex
 			count = ( Long ) s.createCriteria( Human.class )
 				.setProjection( Projections.count( "name" ).setDistinct() )
 				.uniqueResult();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
 			assertEquals( 2, count.longValue() );
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleCounts() ) {
-				// expected
-			}
-			else {
-				throw ex;
-			}
+			// HSQLDB's cannot handle more than 1 argument in SELECT COUNT( DISTINCT ... ) )
+			if ( ! ( getDialect() instanceof HSQLDialect ) )  {
+				throw ex;
+			}
 		}
 		finally {
 			t.rollback();
@@ -297,17 +278,10 @@ public class CriteriaHQLAlignmentTest ex
 		t = s.beginTransaction();
 		try {
 			count = ( Long ) s.createQuery( "select count( name ) from Human" ).uniqueResult();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
+			fail( "should have failed due to SQLGrammarException" );
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleCounts() ) {
-				// expected
-			}
-			else {
-				throw ex;
-			}
+			// expected
 		}
 		finally {
 			t.rollback();
@@ -320,17 +294,10 @@ public class CriteriaHQLAlignmentTest ex
 			count = ( Long ) s.createCriteria( Human.class )
 				.setProjection( Projections.count( "name" ) )
 				.uniqueResult();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
+			fail( "should have failed due to SQLGrammarException" );
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleCounts() ) {
-				// expected
-			}
-			else {
-				throw ex;
-			}
+			// expected
 		}
 		finally {
 			t.rollback();
@@ -343,4 +310,5 @@ public class CriteriaHQLAlignmentTest ex
 		t.commit();
 		s.close();
 	}
+
 }
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java
@@ -89,44 +89,4 @@ public class DeleteOneToOneOrphansTest e
 
 		cleanupData();
 	}
-
-	public void testOrphanedWhileDetachedFailureExpected() {
-		createData();
-
-		Session session = openSession();
-		session.beginTransaction();
-		List results = session.createQuery( "from EmployeeInfo" ).list();
-		assertEquals( 1, results.size() );
-		results = session.createQuery( "from Employee" ).list();
-		assertEquals( 1, results.size() );
-		Employee emp = ( Employee ) results.get( 0 );
-		assertNotNull( emp.getInfo() );
-
-		//only fails if the object is detached
-		session.getTransaction().commit();
-		session.close();
-		session = openSession();
-		session.beginTransaction();
-
-		emp.setInfo( null );
-
-		//save using the new session (this used to work prior to 3.5.x)
-		session.saveOrUpdate(emp);
-
-		session.getTransaction().commit();
-		session.close();
-
-		session = openSession();
-		session.beginTransaction();
-		emp = ( Employee ) session.get( Employee.class, emp.getId() );
-		assertNull( emp.getInfo() );
-		results = session.createQuery( "from EmployeeInfo" ).list();
-		assertEquals( 0, results.size() );
-		results = session.createQuery( "from Employee" ).list();
-		assertEquals( 1, results.size() );
-		session.getTransaction().commit();
-		session.close();
-
-		cleanupData();
-	}
 }
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
@@ -130,43 +130,6 @@ public abstract class ConnectionManageme
 	}
 
 	/**
-	 * Tests to validate that a session holding JDBC resources will not
-	 * be allowed to serialize.
-	 */
-	public final void testEnabledFilterSerialization() throws Throwable {
-		prepare();
-		Session sessionUnderTest = getSessionUnderTest();
-
-		sessionUnderTest.enableFilter( "nameIsNull" );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-		sessionUnderTest.disconnect();
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-
-		byte[] bytes = SerializationHelper.serialize( sessionUnderTest );
-		checkSerializedState( sessionUnderTest );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-		reconnect( sessionUnderTest );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-		sessionUnderTest.disconnect();
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-
-		Session s2 = ( Session ) SerializationHelper.deserialize( bytes );
-		checkDeserializedState( s2 );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-		reconnect( s2 );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-
-		s2.disconnect();
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-		reconnect( s2 );
-		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
-
-		release( sessionUnderTest );
-		release( s2 );
-		done();
-	}
-
-	/**
 	 * Test that a session which has been manually disconnected will be allowed
 	 * to serialize.
 	 */
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml
@@ -20,6 +20,4 @@
 		<property name="name"/>
 	</class>
 
-    <filter-def name="nameIsNull" condition="name is null" />
-
 </hibernate-mapping>
\ No newline at end of file
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml
@@ -56,7 +56,7 @@
     	<property name="sizeKb" lazy="true">
     		<column name="size_mb"
     			read="size_mb * 1024.0"
-    			write="? / cast( 1024.0 as float )"/>
+    			write="? / 1024.0"/>
     	</property>
     </class>
 
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
@@ -200,9 +200,9 @@ public class ComponentTest extends Funct
 			.add( Property.forName("person.yob").between( new Integer(1999), new Integer(2002) ) )
 			.list();
 		if ( getDialect().supportsRowValueConstructorSyntax() ) {
-			s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
+			s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
 				.setDate("dob", new Date("March 25, 1974")).list();
-			s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
+			s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
 				.setDate("dob", new Date("March 25, 1974")).list();
 		}
 		t.commit();
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
@@ -40,8 +40,7 @@ public class MigrationTest extends UnitT
 		SchemaUpdate v2schemaUpdate = new SchemaUpdate( v2cfg );
 		v2schemaUpdate.execute( true, true );
 		assertEquals( 0, v2schemaUpdate.getExceptions().size() );
-		
-		new SchemaExport( v2cfg ).drop( false, true );
+
 	}
 
 }
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java
@@ -87,70 +87,6 @@ public class CompositeElementTest extend
 		s.close();
 	}
 	
-	public void testHandSQLSetOfCompositeElementsByAliasFailureExpected() {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		Child c = new Child( "Child One" );
-		Parent p = new Parent( "Parent" );
-		p.getChildren().add( c );
-		c.setParent( p );
-		s.save( p );
-		s.flush();
-
-		p.getChildren().remove( c );
-		c.setParent( null );
-		s.flush();
-
-		p.getChildren().add( c );
-		c.setParent( p );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("select c from Parent p left outer join p.children c").uniqueResult();
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.delete( p );
-		t.commit();
-		s.close();
-	}
-
-	public void testHandSQLSetOfCompositeElementsByPathFailureExpected() {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		Child c = new Child( "Child One" );
-		Parent p = new Parent( "Parent" );
-		p.getChildren().add( c );
-		c.setParent( p );
-		s.save( p );
-		s.flush();
-
-		p.getChildren().remove( c );
-		c.setParent( null );
-		s.flush();
-
-		p.getChildren().add( c );
-		c.setParent( p );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.createQuery("select p.children from Parent p left outer join p.children").uniqueResult(); //we really need to be able to do this!
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		s.delete( p );
-		t.commit();
-		s.close();
-	}
-
 	public void testCustomColumnReadAndWrite() {
 		final double HEIGHT_INCHES = 49;
 		final double HEIGHT_CENTIMETERS = HEIGHT_INCHES * 2.54d;
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java
@@ -118,8 +118,10 @@ public class BidirectionalOneToManyCasca
 	 * Saves the child object with the parent when the one-to-many association
 	 * uses cascade="all-delete-orphan" and the many-to-one association uses
 	 * cascade="all"
+	 * <p/>
+	 * This test is known to fail. See HHH-2269.
 	 */
-	public void testSaveOrphanDeleteChildWithParent() {
+	public void testSaveOrphanDeleteChildWithParentFailureExpected() {
 		Session session = openSession();
 		Transaction txn = session.beginTransaction();
 		Parent parent = new Parent();
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
@@ -27,6 +27,7 @@ import org.hibernate.criterion.Projectio
 import org.hibernate.criterion.Property;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.criterion.Subqueries;
+import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -1000,16 +1001,11 @@ public class CriteriaQueryTest extends F
 			result = s.createCriteria( Student.class )
 				.setProjection( Projections.countDistinct( "cityState" ) )
 				.uniqueResult();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
 			assertEquals( 1, ( ( Long ) result ).longValue() );
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				// expected
-			}
-			else {
+			// HSQLDB's cannot handle more than 1 argument in SELECT COUNT( DISTINCT ... ) )
+			if ( ! ( getDialect() instanceof HSQLDialect ) )  {
 				throw ex;
 			}
 		}
@@ -1280,18 +1276,11 @@ public class CriteriaQueryTest extends F
 		s = openSession();
 		t = s.beginTransaction();
 		try {
-			List result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				fail( "expected SQLGrammarException" );
-			}
-			assertFalse(result.isEmpty());
-			assertEquals( 1, ((Long)result.get(0)).intValue() );
+			Object result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
 		}
 		catch ( SQLGrammarException ex ) {
-			if ( ! getDialect().supportsTupleDistinctCounts() ) {
-				// expected
-			}
-			else {
+			// HSQLDB's cannot handle more than 1 argument in SELECT COUNT( DISTINCT ... ) )
+			if ( ! ( getDialect() instanceof HSQLDialect ) )  {
 				throw ex;
 			}
 		}
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java
@@ -327,8 +327,6 @@ public class MutableNaturalIdTest extend
 				.setCacheable( true )
 				.uniqueResult();
 		assertNotNull( u );
-		s.getTransaction().commit();
-		s.close();
 
 		assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 );
 		assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 );
--- libhibernate3-java-3.5.4.Final.orig/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java
+++ libhibernate3-java-3.5.4.Final/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java
@@ -227,8 +227,6 @@ public class ImmutableNaturalIdTest exte
 				.setCacheable( true )
 				.uniqueResult();
 		assertNotNull( u );
-		s.getTransaction().commit();
-		s.close();
 
 		assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 );
 		assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 );