Author: twerner Date: 2010-07-28 16:59:19 +0000 (Wed, 28 Jul 2010) New Revision: 12839
Added: trunk/jbossas4/debian/patches/hibernate35.diff Modified: trunk/jbossas4/debian/changelog Log: release Modified: trunk/jbossas4/debian/changelog =================================================================== --- trunk/jbossas4/debian/changelog 2010-07-28 16:58:28 UTC (rev 12838) +++ trunk/jbossas4/debian/changelog 2010-07-28 16:59:19 UTC (rev 12839) @@ -1,4 +1,4 @@ -jbossas4 (4.2.3.GA-3) UNRELEASED; urgency=low +jbossas4 (4.2.3.GA-3) experimental; urgency=low * Team upload. * Fix FTBFS with Hibernate 3.5.x. (Closes: #589599). Added: trunk/jbossas4/debian/patches/hibernate35.diff =================================================================== --- trunk/jbossas4/debian/patches/hibernate35.diff (rev 0) +++ trunk/jbossas4/debian/patches/hibernate35.diff 2010-07-28 16:59:19 UTC (rev 12839) @@ -0,0 +1,52 @@ +Description: Compatibility with Hibernate 3.5 +Author: Miguel Landaeta <[email protected]> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Forwarded: no +Last-Update: 2010-07-18 + +--- jbossas4-4.2.3.GA.orig/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java ++++ jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb3/entity/InjectedSessionFactory.java +@@ -42,6 +42,7 @@ import org.hibernate.engine.FilterDefini + import org.hibernate.metadata.ClassMetadata; + import org.hibernate.metadata.CollectionMetadata; + import org.hibernate.stat.Statistics; ++import org.hibernate.Cache; + import org.jboss.ejb3.PersistenceUnitRegistry; + + /** +@@ -237,4 +238,15 @@ public class InjectedSessionFactory impl + return getSessionFactory().getReference(); + } + ++ // dummy compatibility with Hibernate 3.5.x ++ public boolean containsFetchProfileDefinition(String name) ++ { ++ throw new UnsupportedOperationException("containsFetchProfileDefinition"); ++ } ++ ++ public Cache getCache() ++ { ++ throw new UnsupportedOperationException("getCache"); ++ } ++ + } +--- jbossas4-4.2.3.GA.orig/ejb3/src/main/org/jboss/ejb3/entity/JTATableIdGenerator.java ++++ jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb3/entity/JTATableIdGenerator.java +@@ -40,7 +40,7 @@ import org.hibernate.engine.SessionImple + import org.hibernate.exception.JDBCExceptionHelper; + import org.hibernate.id.Configurable; + import org.hibernate.id.IdentifierGenerationException; +-import org.hibernate.id.IdentifierGeneratorFactory; ++import org.hibernate.id.IdentifierGeneratorHelper; + import org.hibernate.id.PersistentIdentifierGenerator; + import org.hibernate.transaction.JBossTransactionManagerLookup; + import org.hibernate.transaction.TransactionManagerLookup; +@@ -263,7 +263,7 @@ public class JTATableIdGenerator impleme + tm.commit(); + + // transform sequence to the desired type and return the value +- Number typedSequence = IdentifierGeneratorFactory.createNumber(sequence, returnClass); ++ Number typedSequence = IdentifierGeneratorHelper.createNumber(sequence, returnClass); + if (log.isDebugEnabled()) + { + log.debug("generate() returned: " + typedSequence); _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
